diff --git a/app/Models/Server.php b/app/Models/Server.php
index 9948c7a10..93f6d9641 100644
--- a/app/Models/Server.php
+++ b/app/Models/Server.php
@@ -199,7 +199,7 @@ class Server extends Model
     }
 
     /**
-     * Returns non-administrative headers for accessing a server on Scales
+     * Returns non-administrative headers for accessing a server on the daemon
      *
      * @param  string $uuid
      * @return array
diff --git a/app/Repositories/Daemon/FileRepository.php b/app/Repositories/Daemon/FileRepository.php
index 1d6bf7aac..c77baba11 100644
--- a/app/Repositories/Daemon/FileRepository.php
+++ b/app/Repositories/Daemon/FileRepository.php
@@ -132,7 +132,7 @@ class FileRepository
     }
 
     /**
-     * Save the contents of a requested file on the Scales instance.
+     * Save the contents of a requested file on the daemon.
      *
      * @param  string $file
      * @param  string $content
@@ -166,7 +166,7 @@ class FileRepository
     }
 
     /**
-     * Returns a listing of all files and folders within a specified Scales directory.
+     * Returns a listing of all files and folders within a specified directory on the daemon.
      *
      * @param  string $directory
      * @return object
diff --git a/resources/views/admin/servers/new.blade.php b/resources/views/admin/servers/new.blade.php
index 8db93ffcd..bb0a46f0e 100644
--- a/resources/views/admin/servers/new.blade.php
+++ b/resources/views/admin/servers/new.blade.php
@@ -50,7 +50,7 @@
                     <label for="owner" class="control-label">Owner Email</label>
                     <div>
                         {{-- Hacky workaround to prevent Safari and Chrome from trying to suggest emails here --}}
-                        <input id="fake_user_name" name="fake_user[name]" style="position:absolute; top:-10000px;" type="text" value="Autofill Me">
+                        <input id="fake_user_name" name="fake_user[name]" style="position:absolute; top:-10000px;" tabindex="5" type="text" value="Autofill Me">
                         <input type="text" autocomplete="off" name="owner" class="form-control" value="{{ old('owner', Input::get('email')) }}" />
                     </div>
                 </div>
diff --git a/resources/views/layouts/master.blade.php b/resources/views/layouts/master.blade.php
index f66a9a857..f7c7d383d 100644
--- a/resources/views/layouts/master.blade.php
+++ b/resources/views/layouts/master.blade.php
@@ -106,7 +106,7 @@
                             $('#applyUpdate').removeClass('fa-circle-o-notch fa-spinner fa-spin fa-check-circle fa-times-circle').addClass(selector).css({ color: color });
                         });
 
-                        // Socket Recieves New Status from Scales
+                        // Socket Recieves New Status from Daemon
                         socket.on('status', function(data) {
                             var newStatus, selector = 'fa-times-circle';
                             var color = '#E33200';