diff --git a/src/components/FollowButton.vue b/src/components/FollowButton.vue
index f23a91cc..d2c76953 100644
--- a/src/components/FollowButton.vue
+++ b/src/components/FollowButton.vue
@@ -21,7 +21,8 @@
   -->
 
 <template>
-	<div v-if="!serverData.public && cloudId !== account && actorInfo">
+	<!-- Show button only if user is authenticated and she is not the same as the account viewed -->
+	<div v-if="!serverData.public && actorInfo && actorInfo.viewerLink!='viewer'">
 		<button v-if="isCurrentUserFollowing" :class="{'icon-loading-small': followLoading}"
 			@click="unfollow()"
 			@mouseover="followingText=t('social', 'Unfollow')" @mouseleave="followingText=t('social', 'Following')">
diff --git a/src/components/ProfileInfo.vue b/src/components/ProfileInfo.vue
index c7451f6b..467f7213 100644
--- a/src/components/ProfileInfo.vue
+++ b/src/components/ProfileInfo.vue
@@ -150,7 +150,7 @@ export default {
 	},
 	methods: {
 		followRemote() {
-			window.open(OC.generateUrl('/apps/social/api/v1/ostatus/followRemote/' + encodeURI(this.uid)), 'followRemote', 'width=433,height=600toolbar=no,menubar=no,scrollbars=yes,resizable=yes')
+			window.open(OC.generateUrl('/apps/social/api/v1/ostatus/followRemote/' + encodeURI(this.localUid)), 'followRemote', 'width=433,height=600toolbar=no,menubar=no,scrollbars=yes,resizable=yes')
 		}
 	}
 }