diff --git a/src/account/NetworkPage.vue b/src/account/NetworkPage.vue
index d7fde3e..7305ef9 100644
--- a/src/account/NetworkPage.vue
+++ b/src/account/NetworkPage.vue
@@ -59,7 +59,7 @@
             </button>
             <div v-if="errors.has('networkKeys')" class="invalid-feedback d-block">{{ errors.first('networkKeys') }}</div>
             <div v-if="networkKeysRequested && networkKeysRequested === networkId">{{messages.message_network_action_keys_requested}}</div>
-
+            <hr />
             <h5>{{messages.message_network_action_retrieve_keys}}</h5>
             <form @submit.prevent="retrieveRestoreKey()">
                 <div class="form-group">
@@ -69,7 +69,9 @@
                 </div>
                 <div class="form-group">
                     <label for="restoreKeyPassword">{{messages.field_network_key_download_password}}</label>
-                    <input type="text" v-model="restoreKeyPassword" v-validate="'required'" name="restoreKeyPassword" class="form-control" :class="{ 'is-invalid': errors.has('password') }" />
+                    <input type="text" v-model="restoreKeyPassword" v-validate="'required'" name="restoreKeyPassword"
+                           class="form-control" :class="{ 'is-invalid': errors.has('password') }"
+                           :autofocus="this.$route.query.hasOwnProperty('keys_code')"/>
                     <div v-if="errors.has('password')" class="invalid-feedback">{{ errors.first('password') }}</div>
                 </div>
                 <button class="btn btn-secondary">{{messages.button_label_retrieve_keys}}</button>
@@ -203,6 +205,7 @@
             const user = util.currentUser();
             this.refreshStatus(user.uuid);
             this.startStatusRefresher(user);
+            this.restoreKeyCode = this.$route.query.keys_code;
         },
         beforeDestroy () {
             clearInterval(this.refresher);