diff --git a/rowers/templates/login_form.html b/rowers/templates/login_form.html
index 7555e0c1..5aa94c2b 100644
--- a/rowers/templates/login_form.html
+++ b/rowers/templates/login_form.html
@@ -4,6 +4,9 @@
 </head>
 <body>
     <h1>Login</h1>
+    <p><a class="twitter-follow-button"
+       href="https://twitter.com/rowsandall">
+      Follow @rowsandall</a></p>
 
     {% if form.errors %}
         <p style="color: red;">
@@ -23,4 +26,4 @@
 	<a href="/rowers/register">register</a>
 	</p>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/rowers/templates/registration/login.html b/rowers/templates/registration/login.html
index a98484cb..4b4a1698 100644
--- a/rowers/templates/registration/login.html
+++ b/rowers/templates/registration/login.html
@@ -20,11 +20,20 @@
 <tr>
   <td></td>
   <td><a href="/password_reset/">Forgot password?</a></td>
-  </tr>
+</tr>
+
+
+
 </table>
 
 <input type="submit" value="login" />
 <input type="hidden" name="next" value="{{ next }}" />
 </form>
 
+  <p class="midden"><a class="twitter-follow-button"
+       href="https://twitter.com/rowsandall">
+      Follow @rowsandall</a>
+  </p>
+
+
 {% endblock %}
diff --git a/rowers/templates/show_graph.html b/rowers/templates/show_graph.html
index ee240263..8b8fd385 100644
--- a/rowers/templates/show_graph.html
+++ b/rowers/templates/show_graph.html
@@ -16,7 +16,7 @@
     <div class="grid_12">
       <div class="grid_1 alpha">
         <div class="fb-share-button" data-href="https://rowsandall.com/rower/graph/{{ graph.id }}" data-layout="button" data-size="small" data-mobile-iframe="false">
-          <a class="fb-xfbml-parse-ignore" target="_blank" href="https://www.facebook.com/sharer/sharer.php?u=https://rowsandall.com/rowers/graph/{{ graph.id }}&amp;src=sdkpreparse">Share</a></div>
+          <a class="fb-xfbml-parse-ignore" target="_blank" href="https://www.facebook.com/sharer/sharer.php?u=https://rowsandall.com/rowers/graph/{{ graph.id }}">Share</a></div>
       </div>
       <div class="grid_1">
         <a class="twitter-share-button"
diff --git a/rowers/templates/workout_form.html b/rowers/templates/workout_form.html
index 4b89d286..37cd8956 100644
--- a/rowers/templates/workout_form.html
+++ b/rowers/templates/workout_form.html
@@ -221,7 +221,7 @@
     <div class="grid_1 omega">
       <div class="grid_1 alpha">
         <div class="fb-share-button" data-href="https://rowsandall.com/rowers/workout/{{ workout.id }}" data-layout="button" data-size="small" data-mobile-iframe="false">
-          <a class="fb-xfbml-parse-ignore" target="_blank" href="https://www.facebook.com/sharer/sharer.php?u=https://rowsandall.com/rowers/workout/{{ workout.id }}&amp;src=sdkpreparse">Share</a></div>
+          <a class="fb-xfbml-parse-ignore" target="_blank" href="https://www.facebook.com/sharer/sharer.php?u=https://rowsandall.com/rowers/workout/{{ workout.id }}">Share</a></div>
         </div>
       <div class="grid_1 alpha">
         <p>&nbsp;</p>
diff --git a/rowers/templates/workout_view.html b/rowers/templates/workout_view.html
index b088e2cf..fdc14541 100644
--- a/rowers/templates/workout_view.html
+++ b/rowers/templates/workout_view.html
@@ -30,7 +30,7 @@
   <h1>{{ workout.name }}</h1>
                 <div class="grid_1 alpha">
                 <div class="fb-share-button" data-href="https://rowsandall.com/rowers/workout/{{ workout.id }}" data-layout="button" data-size="small" data-mobile-iframe="false">
-                  <a class="fb-xfbml-parse-ignore" target="_blank" href="https://www.facebook.com/sharer/sharer.php?u=https://rowsandall.com/rowers/workout/{{ workout.id }}&amp;src=sdkpreparse">Share</a></div>
+                  <a class="fb-xfbml-parse-ignore" target="_blank" href="https://www.facebook.com/sharer/sharer.php?u=https://rowsandall.com/rowers/workout/{{ workout.id }}">Share</a></div>
               </div>
               <div class="grid_1">
                 <a class="twitter-share-button"
diff --git a/templates/basebase.html b/templates/basebase.html
index 4e83af67..1436e951 100644
--- a/templates/basebase.html
+++ b/templates/basebase.html
@@ -106,10 +106,7 @@
               </p>
 	    </div>
             <div class="grid_4 alpha">
-	      <p>Free Data and Analysis. For Rowers. By Rowers.
-             <a class="twitter-follow-button"
-                 href="https://twitter.com/rowsandall">
-                Follow @rowsandall</a></p>
+	      <p>Free Data and Analysis. For Rowers. By Rowers.</p>
 	    </div>
           </div>
 
