diff --git a/src/main/java/org/freedomsponsors/plugins/jira/SponsorThis.java b/src/main/java/org/freedomsponsors/plugins/jira/SponsorThis.java
index e2d3a36..3645e44 100644
--- a/src/main/java/org/freedomsponsors/plugins/jira/SponsorThis.java
+++ b/src/main/java/org/freedomsponsors/plugins/jira/SponsorThis.java
@@ -2,6 +2,7 @@
 
 import com.atlassian.crowd.embedded.api.User;
 import com.atlassian.jira.config.properties.APKeys.JiraIndexConfiguration;
+import com.atlassian.jira.config.properties.ApplicationProperties;
 import com.atlassian.jira.functest.config.JiraConfig;
 import com.atlassian.jira.issue.Issue;
 import com.atlassian.jira.plugin.webfragment.contextproviders.AbstractJiraContextProvider;
@@ -15,15 +16,21 @@
 
 public class SponsorThis extends AbstractJiraContextProvider
 {       
+	private final ApplicationProperties applicationProperties;
+
+	public SponsorThis(ApplicationProperties applicationProperties) // magic constructor
+    {
+        this.applicationProperties = applicationProperties;
+    }
 	
 	@Override
     public Map getContextMap(User user, JiraHelper jiraHelper) {
         Map contextMap = new HashMap();        
-        //String baseUrl = (String)jiraHelper.getContextParams().get("baseurl");
+        String baseUrl = applicationProperties.getString("jira.baseurl");
         Issue currentIssue = (Issue) jiraHelper.getContextParams().get("issue");        
         String issueKey = currentIssue.getKey();        
         contextMap.put("issueKey", issueKey);
-        //contextMap.put("baseUrl", baseUrl);
+        contextMap.put("baseUrl", baseUrl);
         
         
         return contextMap;
diff --git a/src/main/resources/atlassian-plugin.xml b/src/main/resources/atlassian-plugin.xml
index 6a9c450..68352e9 100644
--- a/src/main/resources/atlassian-plugin.xml
+++ b/src/main/resources/atlassian-plugin.xml
@@ -9,13 +9,14 @@
   <web-item key="sponsor-issue" name="Sponsor this issue" section="operations-operations" weight="100">
     <label>Sponsor this issue!</label>
     <tooltip>Sponsors the issue at FreedomSponsors.org</tooltip>
-    <link linkId="manage-project-link" absolute="true">http://www.freedomsponsors.org/core/issue/sponsor?trackerURL=${baseurl}/browse/${issue.key}</link>
+	<context-provider class="org.freedomsponsors.plugins.jira.SponsorThis"/>
+    <link linkId="manage-project-link" absolute="true">http://www.freedomsponsors.org/core/issue/sponsor?trackerURL=${baseUrl}/browse/${issue.key}</link>
   </web-item>
   <resource type="i18n" name="i18n" location="org.freedomsponsors.plugins.jira"/>
   <web-panel name="SponsorThis" i18n-name-key="sponsor-this.name" key="sponsor-this" location="atl.jira.view.issue.right.context" weight="1000">
 	<label key="sponsor-this.title"/>
     <description key="sponsor-this.description">The SponsorThis Plugin</description>
-    <!--<context-provider class="org.freedomsponsors.plugins.jira.SponsorThis"/>-->
+    <context-provider class="org.freedomsponsors.plugins.jira.SponsorThis"/>
     <resource name="view" type="velocity" location="sponsorthis.vm"/>	
   </web-panel>
 </atlassian-plugin>
diff --git a/src/main/resources/sponsorthis.vm b/src/main/resources/sponsorthis.vm
index a3e24ee..e0a53b3 100644
--- a/src/main/resources/sponsorthis.vm
+++ b/src/main/resources/sponsorthis.vm
@@ -1,3 +1,3 @@
 <p>
-	<a style="font-weight: bold; color: green;" href="http://www.freedomsponsors.org/core/issue/sponsor?trackerURL=${baseurl}/browse/${issue.key}">Sponsor $issue.key on FreedomSponsors.org $issue.project.url</a>
+	<a style="font-weight: bold; color: green;" href="http://www.freedomsponsors.org/core/issue/sponsor?trackerURL=${baseUrl}/browse/${issueKey}">Sponsor $issueKey on FreedomSponsors.org</a>
 </p>
\ No newline at end of file
diff --git a/target/jira-1.0-SNAPSHOT.jar b/target/jira-1.0-SNAPSHOT.jar
index 40f7b13..b9adb77 100644
Binary files a/target/jira-1.0-SNAPSHOT.jar and b/target/jira-1.0-SNAPSHOT.jar differ