diff --git a/services/web/app/views/user/login.jade b/services/web/app/views/user/login.jade
index af77e3a739..132aa4fbf9 100644
--- a/services/web/app/views/user/login.jade
+++ b/services/web/app/views/user/login.jade
@@ -20,7 +20,7 @@ block content
 									placeholder='email@example.com',
 									ng-model="email",
 									ng-model-options="{ updateOn: 'blur' }",
-									autofocus
+									focus="true"
 								)
 								span.small.text-primary(ng-show="loginForm.email.$invalid && loginForm.email.$dirty")
 									| Must be an email address
diff --git a/services/web/app/views/user/register.jade b/services/web/app/views/user/register.jade
index 91d6dcd9ba..a2faf4fe25 100644
--- a/services/web/app/views/user/register.jade
+++ b/services/web/app/views/user/register.jade
@@ -32,7 +32,7 @@ block content
 									ng-model="email",
 									ng-init="email = #{JSON.stringify(new_email)}",
 									ng-model-options="{ updateOn: 'blur' }",
-									autofocus
+									focus="true"
 								)
 								span.small.text-primary(ng-show="registerForm.email.$invalid && registerForm.email.$dirty")
 									| Must be an email address
diff --git a/services/web/public/coffee/directives/focus.coffee b/services/web/public/coffee/directives/focus.coffee
index db742f155f..eb1098b869 100644
--- a/services/web/public/coffee/directives/focus.coffee
+++ b/services/web/public/coffee/directives/focus.coffee
@@ -55,6 +55,17 @@ define [
 					selectName(element)
 		}
 
+
+	App.directive "focus", ($timeout) ->
+		scope:
+			trigger: "@focus"
+
+		link: (scope, element) ->
+			scope.$watch "trigger", (value) ->
+				if value is "true"
+					$timeout ->
+						element[0].focus()
+
 	selectName = (element) ->
 		# Select up to last '.'. I.e. everything
 		# except the file extension