diff --git a/app/pods/containers/new/controller.js b/app/pods/containers/new/controller.js
index ef4a46fae0..04ec148ef0 100644
--- a/app/pods/containers/new/controller.js
+++ b/app/pods/containers/new/controller.js
@@ -124,6 +124,7 @@ export default Ember.ObjectController.extend(NewOrEditContainer, {
   },
 
   initFields: function() {
+    this.set('error',null);
     this.initNetwork();
     this.initEnvironment();
     this.initPorts();
@@ -138,11 +139,16 @@ export default Ember.ObjectController.extend(NewOrEditContainer, {
     this.userImageUuidDidChange();
     this.terminalDidChange();
     this.restartDidChange();
+    this.send('chooseRegistry', this.get('selectedRegistry'));
+    this.updateImageUuid();
+    this.set('restartLimit', 5);
+    this.set('restart', 'no'); // This has to come after restartLimit because changing the limit sets restart.
+    this.set('terminal', 'both');
   },
 
   // Restart
-  restart: 'no',
-  restartLimit: 5,
+  restart: null, //'no',
+  restartLimit: null, //5,
 
   restartDidChange: function() {
     var policy = {};
@@ -250,7 +256,8 @@ export default Ember.ObjectController.extend(NewOrEditContainer, {
 
   // Image
   registryChoices: null,
-  displayPrefix: 'docker:',
+  selectedRegistry: null,
+  displayPrefix: '',
   userImageUuid: 'ubuntu:14.04.1',
   credentialChoices: null,
   showCredential: Ember.computed.gt('credentialChoices.length',0),
@@ -441,7 +448,7 @@ export default Ember.ObjectController.extend(NewOrEditContainer, {
   }.observes('memoryMb'),
 
   // Terminal
-  terminal: 'both',
+  terminal: null, //'both',
   terminalDidChange: function() {
     var val = this.get('terminal');
     var stdinOpen = ( val === 'interactive' || val === 'both' );
diff --git a/app/pods/containers/new/route.js b/app/pods/containers/new/route.js
index 0dcff87903..4fb19df6da 100644
--- a/app/pods/containers/new/route.js
+++ b/app/pods/containers/new/route.js
@@ -81,6 +81,7 @@ export default Ember.Route.extend({
     if (isExiting)
     {
       controller.set('tab', 'command');
+      controller.set('advanced', false);
     }
   }
 });
diff --git a/package.json b/package.json
index 25d28b49e3..a55cd9a0ae 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ui",
-  "version": "0.13.0",
+  "version": "0.13.1",
   "private": true,
   "directories": {
     "doc": "doc",