diff --git a/src/www/messages/en.json b/src/www/messages/en.json
index c92b387b4e8..ef434b43ad0 100644
--- a/src/www/messages/en.json
+++ b/src/www/messages/en.json
@@ -72,7 +72,9 @@
   "server-added": "Added server “{serverName}”!",
   "server-connected": "Connected to “{serverName}”",
   "server-create-your-own": "Don’t have an access key?<br>Create your own at {openLink}our website{closeLink}.",
+  "server-create-your-own-access": "Don’t have an access key?<br>Create your own at {openLink}our website{closeLink} or<br>request an {openLink2}access key{closeLink}.",
   "server-create-your-own-zero-state": "Don’t have a server?<br>Create your own at {openLink}our website{closeLink}.",
+  "server-create-your-own-zero-state-access": "Don’t have a server?<br>Create your own at {openLink}our website{closeLink} or<br>request an {openLink2}access key{closeLink}.",
   "server-default-name": "Proxy Server",
   "server-default-name-outline": "Outline Server",
   "server-detected": "Please confirm that you want to add this server.",
diff --git a/src/www/messages/fa.json b/src/www/messages/fa.json
index 1d17c0e701b..e91fe454065 100644
--- a/src/www/messages/fa.json
+++ b/src/www/messages/fa.json
@@ -71,7 +71,9 @@
   "server-added": "سرور «{serverName}» اضافه شد!",
   "server-connected": "به «{serverName}» وصل شدید",
   "server-create-your-own": "کلید دسترسی ندارید؟<br>کلید دسترسی خودتان را در {openLink}وبسایت ما{closeLink} ایجاد کنید.",
+  "server-create-your-own-access": "کلید دسترسی ندارید؟<br>کلید دسترسی خودتان را در {openLink}وبسایت ما{closeLink} ایجاد کنید یا <br>یک {openLink2}کلید دسترسی{closeLink} درخواست کنید.",
   "server-create-your-own-zero-state": "سرور ندارید؟<br>سرور خودتان را در {openLink}وبسایت ما{closeLink} ایجاد کنید.",
+  "server-create-your-own-zero-state-access": "سرور ندارید؟<br>سرور خود را در {openLink}وب سایت ما {closeLink}ایجاد کنید یا <br>یک {openLink2}کلید دسترسی{closeLink} درخواست کنید.",
   "server-default-name": "سرور پراکسی",
   "server-default-name-outline": "سرور Outline",
   "server-detected": "لطفاً تأیید کنید که می‌خواهید این سرور اضافه شود.",
diff --git a/src/www/ui_components/add-server-view.js b/src/www/ui_components/add-server-view.js
index 0d2a04dd4c6..ff687364667 100644
--- a/src/www/ui_components/add-server-view.js
+++ b/src/www/ui_components/add-server-view.js
@@ -163,15 +163,24 @@ Polymer({
         <iron-icon icon="communication:vpn-key" slot="suffix"></iron-icon>
       </paper-input>
       <div class="footer center top-divider">
-        <div
-          id="addServerFooter"
-          inner-h-t-m-l="[[localize('server-create-your-own', 'breakLine', '<br/>', 'openLink', '<a href=https://s3.amazonaws.com/outline-vpn/index.html>', 'closeLink', '</a>')]]"
-        ></div>
-        <div
-          id="invalidAccessKeyFooter"
-          hidden=""
-          inner-h-t-m-l="[[localize('server-add-invalid', 'openLine', '<span class=input-invalid>', 'closeLine', '</span><br/>')]]"
-        ></div>
+        <template is="dom-if" if="[[shouldShowNormalAccessMessage]]">
+          <div
+            id="addServerFooter"
+            inner-h-t-m-l="[[localize('server-create-your-own', 'breakLine', '<br/>', 'openLink', '<a href=https://s3.amazonaws.com/outline-vpn/index.html>', 'closeLink', '</a>')]]"
+          ></div>
+        </template>
+        <template is="dom-if" if="[[shouldShowAltAccessMessage]]">
+          <div
+            id="addServerFooterAlt"
+            inner-h-t-m-l="[[localize('server-create-your-own-access', 'breakLine', '<br/>', 'openLink', '<a href=https://s3.amazonaws.com/outline-vpn/index.html>', 'openLink2', '<a href=https://www.reddit.com/r/outlinevpn/wiki/index/outline_vpn_access_keys/>', 'closeLink', '</a>')]]"
+          ></div>
+        </template>
+        <template is="dom-if" if="[[invalidAccessKeyInput]]">
+          <div
+            id="invalidAccessKeyFooter"
+            inner-h-t-m-l="[[localize('server-add-invalid', 'openLine', '<span class=input-invalid>', 'closeLine', '</span><br/>')]]"
+          ></div>
+        </template>
       </div>
     </paper-dialog>
 
@@ -201,10 +210,23 @@ Polymer({
 
   properties: {
     localize: Function,
+    useAltAccessMessage: Boolean,
+    invalidAccessKeyInput: {
+      Boolean,
+      value: false,
+    },
     accessKey: {
       type: String,
       observer: '_accessKeyChanged',
     },
+    shouldShowNormalAccessMessage: {
+      type: Boolean,
+      computed: '_computeShouldShowNormalAccessMessage(useAltAccessMessage, invalidAccessKeyInput)',
+    },
+    shouldShowAltAccessMessage: {
+      type: Boolean,
+      computed: '_computeShouldShowAltAccessMessage(useAltAccessMessage, invalidAccessKeyInput)',
+    },
   },
 
   ready: function() {
@@ -298,15 +320,21 @@ Polymer({
     var input = event.target;
     input.toggleClass('input-invalid', input.invalid);
     if (input.invalid) {
-      this.$.addServerFooter.hidden = true;
-      this.$.invalidAccessKeyFooter.hidden = false;
+      this.invalidAccessKeyInput = input.invalid;
     } else {
-      this.$.addServerFooter.hidden = false;
-      this.$.invalidAccessKeyFooter.hidden = true;
+      this.invalidAccessKeyInput = false;
     }
   },
 
   _disallowScroll: function(event) {
     event.preventDefault();
   },
+
+  _computeShouldShowNormalAccessMessage(useAltAccessMessage, invalidAccessKeyInput) {
+    return !useAltAccessMessage && !invalidAccessKeyInput;
+  },
+
+  _computeShouldShowAltAccessMessage(useAltAccessMessage, invalidAccessKeyInput) {
+    return useAltAccessMessage && !invalidAccessKeyInput;
+  },
 });
diff --git a/src/www/ui_components/app-root.js b/src/www/ui_components/app-root.js
index 42a40679382..f55fcc967de 100644
--- a/src/www/ui_components/app-root.js
+++ b/src/www/ui_components/app-root.js
@@ -271,7 +271,7 @@ export class AppRoot extends mixinBehaviors([AppLocalizeBehavior], PolymerElemen
         </app-header>
 
         <iron-pages id="pages" selected="[[page]]" attr-for-selected="name">
-          <servers-view name="servers" id="serversView" servers="[[servers]]" localize="[[localize]]"></servers-view>
+          <servers-view name="servers" id="serversView" servers="[[servers]]" localize="[[localize]]" use-alt-access-message="[[useAltAccessMessage]]""></servers-view>
           <feedback-view name="feedback" id="feedbackView" localize="[[localize]]"></feedback-view>
           <about-view
             name="about"
@@ -389,7 +389,7 @@ export class AppRoot extends mixinBehaviors([AppLocalizeBehavior], PolymerElemen
         <a hidden="" id="toastUrl" href="[[toastUrl]]"></a>
       </paper-toast>
 
-      <add-server-view id="addServerView" localize="[[localize]]"></add-server-view>
+      <add-server-view id="addServerView" localize="[[localize]]" use-alt-access-message="[[useAltAccessMessage]]"></add-server-view>
 
       <!-- Modal dialogs must be placed outside of app-header-layout, see
     /~https://github.com/PolymerElements/paper-dialog/issues/152 and
@@ -540,6 +540,10 @@ export class AppRoot extends mixinBehaviors([AppLocalizeBehavior], PolymerElemen
       toastUrl: {
         type: String,
       },
+      useAltAccessMessage: {
+        type: Boolean,
+        computed: '_computeUseAltAccessMessage(language)',
+      },
     };
   }
 
@@ -766,5 +770,10 @@ export class AppRoot extends mixinBehaviors([AppLocalizeBehavior], PolymerElemen
       return a.name > b.name ? 1 : -1;
     });
   }
+
+  _computeUseAltAccessMessage(language) {
+    // Hack to show an alternative message
+    return language === 'fa' && this.platform !== 'ios' && this.platform !== 'osx';
+  }
 }
 customElements.define(AppRoot.is, AppRoot);
diff --git a/src/www/views/servers_view/index.ts b/src/www/views/servers_view/index.ts
index af2dc5f835e..598621d972a 100644
--- a/src/www/views/servers_view/index.ts
+++ b/src/www/views/servers_view/index.ts
@@ -46,10 +46,6 @@ Polymer({
         color: var(--medium-green);
         text-decoration: none;
       }
-      /* Do not remove, this allows the hidden attribute to work with flex displays. */
-      [hidden] {
-        display: none !important;
-      }
       .server-list-container {
         width: 100%;
         height: 100%;
@@ -98,19 +94,29 @@ Polymer({
       }
     </style>
     <div class="server-list-container">
-      <div class="flex-column-container" hidden$="[[!shouldShowZeroState]]">
+      <template is="dom-if" if="[[shouldShowZeroState]]">
         <div class="flex-column-container">
-          <paper-button noink="" on-tap="_requestPromptAddServer">
-            <server-connection-indicator connection-state="disconnected"></server-connection-indicator>
-            <div class="header">[[localize('server-add')]]</div>
-            <div class="subtle">[[localize('server-add-zero-state-instructions')]]</div>
-          </paper-button>
+          <div class="flex-column-container">
+            <paper-button noink="" on-tap="_requestPromptAddServer">
+              <server-connection-indicator connection-state="disconnected"></server-connection-indicator>
+              <div class="header">[[localize('server-add')]]</div>
+              <div class="subtle">[[localize('server-add-zero-state-instructions')]]</div>
+            </paper-button>
+          </div>
+          <template is="dom-if" if="[[!useAltAccessMessage]]">
+            <div
+             class="footer subtle"
+              inner-h-t-m-l="[[localize('server-create-your-own-zero-state', 'breakLine', '<br/>', 'openLink', '<a href=https://s3.amazonaws.com/outline-vpn/index.html>', 'closeLink', '</a>')]]"
+            ></div>
+          </template>
+          <template is="dom-if" if="[[useAltAccessMessage]]">
+            <div
+              class="footer subtle"
+              inner-h-t-m-l="[[localize('server-create-your-own-zero-state-access', 'breakLine', '<br/>', 'openLink', '<a href=https://s3.amazonaws.com/outline-vpn/index.html>', 'openLink2', '<a href=https://www.reddit.com/r/outlinevpn/wiki/index/outline_vpn_access_keys/>', 'closeLink', '</a>')]]"
+            ></div>
+          </template>
         </div>
-        <div
-          class="footer subtle"
-          inner-h-t-m-l="[[localize('server-create-your-own-zero-state', 'breakLine', '<br/>', 'openLink', '<a href=https://s3.amazonaws.com/outline-vpn/index.html>', 'closeLink', '</a>')]]"
-        ></div>
-      </div>
+      </template>
       <user-comms-dialog
         id="autoConnectDialog"
         localize="[[localize]]"
@@ -118,12 +124,13 @@ Polymer({
         detail-localization-key="auto-connect-dialog-detail"
         fire-event-on-hide="AutoConnectDialogDismissed"
       ></user-comms-dialog>
-      <server-list
-        id="serverList"
-        hidden$="[[shouldShowZeroState]]"
-        servers="[[servers]]"
-        localize="[[localize]]"
-      ></server-list>
+      <template is="dom-if" if="[[!shouldShowZeroState]]">
+        <server-list
+          id="serverList"
+          servers="[[servers]]"
+          localize="[[localize]]"
+        ></server-list>
+      </template>
     </div>
   `,
 
@@ -131,6 +138,7 @@ Polymer({
 
   properties: {
     localize: Function,
+    useAltAccessMessage: Boolean,
     servers: Array,
     shouldShowZeroState: {
       type: Boolean,