4 files changed, 25 insertions, 9 deletions
diff --git a/src/components/settings/settings.vue b/src/components/settings/settings.vue
index 3f920de5..39125009 100644
--- a/src/components/settings/settings.vue
+++ b/src/components/settings/settings.vue
@@ -120,7 +120,7 @@
             </li>
             <ul class="setting-list suboptions" >
               <li>
-                <input :disabled="!hideAttachmentsInConvLocal" type="checkbox" id="preloadImage" v-model="preloadImage">
+                <input :disabled="!hideNsfwLocal" type="checkbox" id="preloadImage" v-model="preloadImage">
                 <label for="preloadImage">{{$t('settings.preload_images')}}</label>
               </li>
             </ul>
diff --git a/src/components/user_finder/user_finder.js b/src/components/user_finder/user_finder.js
index 74f79d1b..55c6c402 100644
--- a/src/components/user_finder/user_finder.js
+++ b/src/components/user_finder/user_finder.js
@@ -11,6 +11,7 @@ const UserFinder = {
     },
     toggleHidden () {
       this.hidden = !this.hidden
+      this.$emit('toggled', this.hidden)
     }
   }
 }
diff --git a/src/components/user_finder/user_finder.vue b/src/components/user_finder/user_finder.vue
index 4d9f6842..9efdfab7 100644
--- a/src/components/user_finder/user_finder.vue
+++ b/src/components/user_finder/user_finder.vue
@@ -1,11 +1,14 @@
 <template>
   <div class="user-finder-container">
     <i class="icon-spin4 user-finder-icon animate-spin-slow" v-if="loading" />
-    <a href="#" v-if="hidden"  :title="$t('finder.find_user')" ><i class="icon-user-plus user-finder-icon" @click.prevent.stop="toggleHidden" /></a>
-    <span v-else>
+    <a href="#" v-if="hidden" :title="$t('finder.find_user')"><i class="icon-user-plus user-finder-icon" @click.prevent.stop="toggleHidden" /></a>
+    <template v-else>
       <input class="user-finder-input" @keyup.enter="findUser(username)" v-model="username" :placeholder="$t('finder.find_user')" id="user-finder-input" type="text"/>
+      <button class="btn search-button" @click="findUser(username)">
+        <i class="icon-search"/>
+      </button>
       <i class="icon-cancel user-finder-icon" @click.prevent.stop="toggleHidden"/>
-    </span>
+    </template>
   </div>
 </template>
 
@@ -16,11 +19,23 @@
 
 .user-finder-container {
   max-width: 100%;
-}
+  display: inline-flex;
+  align-items: baseline;
+  vertical-align: baseline;
+
+
+  .user-finder-input,
+  .search-button {
+    height: 29px;
+  }
+  .user-finder-input {
+    max-width: 80%;
+  }
 
-.user-finder-input {
-  max-width: 80%;
-  vertical-align: middle;
+  .search-button {
+    margin-left: .5em;
+    margin-right: .5em;
+  }
 }
 
 </style>
diff --git a/src/components/user_settings/user_settings.vue b/src/components/user_settings/user_settings.vue
index 67b65b57..b238571d 100644
--- a/src/components/user_settings/user_settings.vue
+++ b/src/components/user_settings/user_settings.vue
@@ -31,7 +31,7 @@
             </p>
             <p>
               <input type="checkbox" v-model="newHideNetwork" id="account-hide-network">
-              <label for="account-no-rich-text">{{$t('settings.hide_network_description')}}</label>
+              <label for="account-hide-network">{{$t('settings.hide_network_description')}}</label>
             </p>
             <button :disabled='newName.length <= 0' class="btn btn-default" @click="updateProfile">{{$t('general.submit')}}</button>
           </div>