diff --git a/app/initializers/extend-ember-input.js b/app/initializers/extend-ember-input.js
index 0b45ccf13..9cbc175c8 100644
--- a/app/initializers/extend-ember-input.js
+++ b/app/initializers/extend-ember-input.js
@@ -10,8 +10,10 @@ export function initialize(/*application */) {
   Checkbox.reopen(SafeStyle);
 
   // Disable iOS auto-capitalization
+  //
   TextField.reopen({
     attributeBindings: ['autocapitalize','spellcheck','autocomplete'],
+    autocomplete: 'off',
     autocapitalize: 'none',
   });
 }
diff --git a/lib/login/addon/components/login-user-pass/template.hbs b/lib/login/addon/components/login-user-pass/template.hbs
index 82eddea9e..8db851bec 100644
--- a/lib/login/addon/components/login-user-pass/template.hbs
+++ b/lib/login/addon/components/login-user-pass/template.hbs
@@ -11,14 +11,14 @@
       </div>
     </div>
     <div>
-      {{input type="text" id="login-username" class="form-control login-user" value=username placeholder=(t 'loginUserPass.userPlaceholder')}}
+      {{input type="text" id="login-username" autocomplete="username" class="form-control login-user" value=username placeholder=(t 'loginUserPass.userPlaceholder')}}
     </div>
   </div>
 
   <div class="pt-15 pb-30">
     <label>{{t 'loginUserPass.passwordLabel'}}</label>
     <div>
-      {{input id="login-password" type="password" class="form-control login-pass" value=password}}
+      {{input id="login-password" autocomplete="password" type="password" class="form-control login-pass" value=password}}
     </div>
   </div>
 
diff --git a/lib/shared/addon/components/machine/driver-custom/component.js b/lib/shared/addon/components/machine/driver-custom/component.js
index 602febcef..61d1ad4cb 100644
--- a/lib/shared/addon/components/machine/driver-custom/component.js
+++ b/lib/shared/addon/components/machine/driver-custom/component.js
@@ -95,7 +95,7 @@ export default Component.extend(Driver, {
       roleFlags = ' --' + role.join(' --');
     }
 
-    let out = `docker run -v /var/run/docker.sock:/var/run/docker.sock --net=host ${image}${roleFlags} --server ${url} --token ${token} --ca-checksum ${checksum}`;
+    let out = `docker run -d --restart=unless-stopped -v /var/run/docker.sock:/var/run/docker.sock --net=host ${image}${roleFlags} --server ${url} --token ${token} --ca-checksum ${checksum}`;
 
     const labels = get(this, 'labels')||{};
     Object.keys(labels).forEach((key) => {
diff --git a/translations/en-us.yaml b/translations/en-us.yaml
index d71916070..dc463f23c 100644
--- a/translations/en-us.yaml
+++ b/translations/en-us.yaml
@@ -3434,6 +3434,11 @@ machine:
       label: Region
 
   driverCustom:
+    detected: |
+      {count, plural,
+        =1 {# new node has registered}
+        other {# new nodes have registered}
+      }
     command:
       instructions: 'Run this command on an existing machine already running a supported version of Docker.'
     ssh: