diff --git a/core/client/components/gh-trim-focus-input.js b/core/client/components/gh-trim-focus-input.js
index 7e9b53b30c..4e69b7c36b 100644
--- a/core/client/components/gh-trim-focus-input.js
+++ b/core/client/components/gh-trim-focus-input.js
@@ -1,8 +1,17 @@
+/*global device*/
 var TrimFocusInput = Ember.TextField.extend({
     focus: true,
 
+    attributeBindings: ['autofocus'],
+
+    autofocus: Ember.computed(function () {
+        return (device.ios()) ? false : 'autofocus';
+    }),
+
     setFocus: function () {
-        if (this.focus) {
+        // This fix is required until Mobile Safari has reliable
+        // autofocus, select() or focus() support
+        if (this.focus && !device.ios()) {
             this.$().val(this.$().val()).focus();
         }
     }.on('didInsertElement'),
diff --git a/core/client/templates/signin.hbs b/core/client/templates/signin.hbs
index a138583728..f225774759 100644
--- a/core/client/templates/signin.hbs
+++ b/core/client/templates/signin.hbs
@@ -2,7 +2,7 @@
     <form id="login" class="login-form" method="post" novalidate="novalidate" {{action 'validateAndAuthenticate' on='submit'}}>
         <div class="email-wrap">
             <span class="input-icon icon-mail">
-                {{gh-trim-focus-input class="email" type="email" placeholder="Email Address" name="identification" autofocus="autofocus" 
+                {{gh-trim-focus-input class="email" type="email" placeholder="Email Address" name="identification" 
                 autocapitalize="off" autocorrect="off" value=identification}}
             </span>
         </div>