diff --git a/app/soapbox/features/account/components/header.js b/app/soapbox/features/account/components/header.js
index a26ff710f..467908303 100644
--- a/app/soapbox/features/account/components/header.js
+++ b/app/soapbox/features/account/components/header.js
@@ -286,22 +286,19 @@ class Header extends ImmutablePureComponent {
               </div>
             }
 
-            {
-              me &&
-              <div className='account__header__extra__buttons'>
-                <ActionButton account={account} />
-                {account.get('id') !== me &&
-                  <Button className='button button-alternative-2' onClick={this.props.onDirect}>
-                    <FormattedMessage
-                      id='account.message' defaultMessage='Message' values={{
-                        name: account.get('acct'),
-                      }}
-                    />
-                  </Button>
-                }
-                <DropdownMenuContainer items={menu} icon='ellipsis-v' size={24} direction='right' />
-              </div>
-            }
+            <div className='account__header__extra__buttons'>
+              <ActionButton account={account} />
+              {(me && account.get('id') !== me) &&
+                <Button className='button button-alternative-2' onClick={this.props.onDirect}>
+                  <FormattedMessage
+                    id='account.message' defaultMessage='Message' values={{
+                      name: account.get('acct'),
+                    }}
+                  />
+                </Button>
+              }
+              { me && <DropdownMenuContainer items={menu} icon='ellipsis-v' size={24} direction='right' /> }
+            </div>
 
           </div>
         </div>
diff --git a/app/soapbox/features/ui/components/action_button.js b/app/soapbox/features/ui/components/action_button.js
index b0b114ee6..830ce33a8 100644
--- a/app/soapbox/features/ui/components/action_button.js
+++ b/app/soapbox/features/ui/components/action_button.js
@@ -16,6 +16,7 @@ import {
 const messages = defineMessages({
   unfollow: { id: 'account.unfollow', defaultMessage: 'Unfollow' },
   follow: { id: 'account.follow', defaultMessage: 'Follow' },
+  remote_follow: { id: 'account.remote_follow', defaultMessage: 'Remote follow' },
   requested: { id: 'account.requested', defaultMessage: 'Awaiting approval. Click to cancel follow request' },
   requested_small: { id: 'account.requested_small', defaultMessage: 'Awaiting approval' },
   unblock: { id: 'account.unblock', defaultMessage: 'Unblock @{name}' },
@@ -83,7 +84,9 @@ class ActionButton extends ImmutablePureComponent {
     const { account, intl, me, small } = this.props;
     let actionBtn = null;
 
-    if (!account || !me) return actionBtn;
+    if (!me) {
+      actionBtn = <form method='POST' action='/main/ostatus'><input type='hidden' name='nickname' value={account.get('username')} /><input type='hidden' name='profile' value='' /><Button className='logo-button' text={intl.formatMessage(messages.remote_follow)} click='submit' /></form>;
+    }
 
     if (me !== account.get('id')) {
       if (!account.get('relationship')) { // Wait until the relationship is loaded