diff --git a/.gitignore b/.gitignore
index a76c51ad..f49a50f8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,6 @@ vendor/
 *.iml
 .idea
 packages
-*.lock
\ No newline at end of file
+*.lock
+*.sublime-workspace
+*.sublime-project
\ No newline at end of file
diff --git a/client/views/signUp/signUp.html b/client/views/signUp/signUp.html
index 82703926..0b678764 100644
--- a/client/views/signUp/signUp.html
+++ b/client/views/signUp/signUp.html
@@ -39,7 +39,7 @@ <h3>{{i18n "createAccount"}}</h3>
             {{#if showEmail}}
               <div class="form-group">
                 <label>{{i18n "emailAddress"}}</label>
-                <input autofocus type="email" class="form-control" value=''>
+                <input {{#unless showUsername}}autofocus{{/unless}} type="email" class="form-control" value=''>
               </div>
             {{/if}}