diff --git a/public/templates/account.tpl b/public/templates/account.tpl
index efc5d8099d..91c76d4ad9 100644
--- a/public/templates/account.tpl
+++ b/public/templates/account.tpl
@@ -59,7 +59,7 @@
 		</div>
 	</div>
 	<div id="user-actions" class="container">
-		<a id="add-friend-btn" href="#" class="btn">Add Friend</a>
+		<a id="add-friend-btn" href="#" class="btn">Follow</a>
 	</div>
 	<br/>
 	<div id="user-action-alert" class="alert alert-success hide"></div>
@@ -104,16 +104,14 @@ var theirid = '{theirid}';
         addFriendBtn.on('click', function() {
         	$.post('/users/addfriend', {uid: theirid},
             	function(data) {
+            		addFriendBtn.remove();
             		$('#user-action-alert').html('Friend Added!').show();
 				}                
 			);
         	return false;
         });
 
-        
-
     });
-    
 
 }());
 </script>
\ No newline at end of file
diff --git a/public/templates/friends.tpl b/public/templates/friends.tpl
index 233bafa3ad..57edeb8563 100644
--- a/public/templates/friends.tpl
+++ b/public/templates/friends.tpl
@@ -32,7 +32,7 @@
 				<span class='postcount'>{friends.postcount}</span>
 				<i class='icon-pencil'></i>
 			</div>
-			<a id="remove-friend-btn" href="#" class="btn remove-friend-btn" friendid="{friends.uid}">Unfriend</a>
+			<a id="remove-friend-btn" href="#" class="btn remove-friend-btn" friendid="{friends.uid}">Unfollow</a>
 		</div>
 
 		<!-- END friends -->
@@ -72,7 +72,7 @@ var friendCount = '{friendCount}';
 				
 				$.post('/users/removefriend', {uid: friendid},
 	            	function(data) {
-	            		button.parent().remove();
+	            		removeBtn.parent().remove();
 					}                
 				);
 				return false;