diff --git a/lib/rhc/wizard.rb b/lib/rhc/wizard.rb
index 041c7098b..bbc8f0c1d 100644
--- a/lib/rhc/wizard.rb
+++ b/lib/rhc/wizard.rb
@@ -382,11 +382,11 @@ def config_namespace_stage
           warn "none"
 
           paragraph do
-            say "Your namespace is unique to your account and is the suffix of the " \
-                "public URLs we assign to your applications. You may configure your " \
-                "namespace here or leave it blank and use 'rhc create-domain' to " \
-                "create a namespace later.  You will not be able to create " \
-                "applications without first creating a namespace."
+            say [
+              "Your namespace is unique to your account and is the suffix of the public URLs we assign to your applications.",
+              ("You may configure your namespace here or leave it blank and use 'rhc create-domain' to create a namespace later." if namespace_optional?),
+              "You will not be able to create applications without first creating a namespace.",
+            ].compact.join(' ')
           end
 
           ask_for_namespace
@@ -592,6 +592,11 @@ def stages
     def finalize_stage
       true
     end
+    
+    protected
+      def namespace_optional?
+        false
+      end    
   end
 
   class DomainWizard < Wizard
diff --git a/spec/rhc/commands/app_spec.rb b/spec/rhc/commands/app_spec.rb
index 31eda3dc5..d460bc412 100644
--- a/spec/rhc/commands/app_spec.rb
+++ b/spec/rhc/commands/app_spec.rb
@@ -163,7 +163,7 @@
       before{ rest_client.domains.clear }
       let(:arguments) { ['app', 'create', 'app1', 'mock_standalone_cart-1'] }
       # skips login stage and insecure check because of mock rest client, doesn't check keys
-      it { run_output(['mydomain', 'y', 'mykey']).should match(/This wizard.*Checking your namespace.*Your domain name 'mydomain' has been successfully created.*Creating application.*Your public SSH key.*Uploading key 'mykey'.*Your application 'app1' is now available.*Cloned to/m) }
+      it { run_output(['mydomain', 'y', 'mykey']).should match(/This wizard.*Checking your namespace.*assign to your applications\. You will not be able to create applications without first creating a namespace.*Your domain name 'mydomain' has been successfully created.*Creating application.*Your public SSH key.*Uploading key 'mykey'.*Your application 'app1' is now available.*Cloned to/m) }
     end
 
     context 'when run without a cart' do