diff --git a/app/containers/run/route.js b/app/containers/run/route.js
index ccc26fa5b..142c473fe 100644
--- a/app/containers/run/route.js
+++ b/app/containers/run/route.js
@@ -175,7 +175,12 @@ export default Route.extend({
     }
 
     if (!ns) {
-      ns = clusterStore.getById('namespace', get(this, `prefs.${C.PREFS.LAST_NAMESPACE}`));
+      const project = window.l('route:application').modelFor('authenticated.project').get('project');
+      const projectId = project.get('id');
+      const lastNamespace = clusterStore.getById('namespace', get(this, `prefs.${C.PREFS.LAST_NAMESPACE}`));
+      if ( lastNamespace && get(lastNamespace, 'projectId') === projectId ) {
+        ns = lastNamespace;
+      }
     }
 
     let namespaceId = null;
diff --git a/lib/shared/addon/components/form-namespace/component.js b/lib/shared/addon/components/form-namespace/component.js
index eb9d72d8b..978e55b6c 100644
--- a/lib/shared/addon/components/form-namespace/component.js
+++ b/lib/shared/addon/components/form-namespace/component.js
@@ -61,7 +61,6 @@ export default Component.extend({
       } else {
         next(() => {
           set(this, 'mode', CREATE);
-          set(this, 'createNamespace.name', 'default')
         });
       }