diff --git a/Netdisco/Changes b/Netdisco/Changes
index 2d09b4e2..44ea9a39 100644
--- a/Netdisco/Changes
+++ b/Netdisco/Changes
@@ -7,6 +7,7 @@
   * User Reports appear in "My Reports" menu if no category is given
   * Permit clipboard copy of device IP from Job Queue rows
   * Failed Job Device IPs link to Discover form with pre-filled Discover IP
+  * Set form focus to Username field on login form
 
 2.024003 - 2014-02-27
 
diff --git a/Netdisco/lib/App/Netdisco.pm b/Netdisco/lib/App/Netdisco.pm
index 8eac4874..6bd29144 100644
--- a/Netdisco/lib/App/Netdisco.pm
+++ b/Netdisco/lib/App/Netdisco.pm
@@ -203,7 +203,7 @@ template from this distribution:
 
  mkdir ~/environments
  cp ~/perl5/lib/perl5/auto/share/dist/App-Netdisco/environments/deployment.yml ~/environments
- chmod +w ~/environments/deployment.yml
+ chmod 600 ~/environments/deployment.yml
 
 Edit the file ("C<~/environments/deployment.yml>") and change the database
 connection parameters to match those for your local system (that is, the
diff --git a/Netdisco/share/views/index.tt b/Netdisco/share/views/index.tt
index 3a2ccf71..7e7fa0c9 100644
--- a/Netdisco/share/views/index.tt
+++ b/Netdisco/share/views/index.tt
@@ -38,7 +38,7 @@
         [% IF NOT session.logged_in_user %]
         <form class="nd_login-form" method="post" action="[% uri_for('/login') %]">
           <div class="form-horizontal">
-            <input placeholder="Username" class="span2" name="username" type="text" required="required"/>
+            <input id='loginuser' placeholder="Username" class="span2" name="username" type="text" required="required"/>
             <input placeholder="Password" class="span2" name="password" type="password" required="required"/>
             <button type="submit" class="btn btn-info">Log In</button>
           </div>
@@ -85,6 +85,7 @@
 <script type="text/javascript">
   var stats_loaded = 0;
   $('#nq').focus(); // set focus to navbar search
+  $('#loginuser').focus(); // set focus to login, if it's there
 
   $('.collapse').on('show', function() {
     $('.nd_chevron').toggleClass('icon-chevron-up icon-chevron-down');