diff --git a/src/views/apps.html b/src/views/apps.html
index c5e3a0842..9fa69e7f0 100644
--- a/src/views/apps.html
+++ b/src/views/apps.html
@@ -20,7 +20,9 @@
 
                                         <div class="input-group-btn">
                                             <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
-                                                {{ (!appConfigure.location ? '' : (appConfigure.domain.config.hyphenatedSubdomains ? '-' : '.')) + appConfigure.domain.domain }}
+                                                <!-- the admin check is to check for spaces user -->
+                                                <span ng-if="user.admin">{{ (!appConfigure.location ? '' : (appConfigure.domain.config.hyphenatedSubdomains ? '-' : '.')) + appConfigure.domain.domain }}</span>
+                                                <span ng-if="!user.admin">{{ (!appConfigure.location ? '' : '-') + user.username + '.' + appConfigure.domain.domain }}</span>
                                                 <span class="caret"></span>
                                             </button>
                                             <ul class="dropdown-menu dropdown-menu-right" role="menu">
diff --git a/src/views/appstore.html b/src/views/appstore.html
index 7e2bfd07c..d440a82d5 100644
--- a/src/views/appstore.html
+++ b/src/views/appstore.html
@@ -23,7 +23,9 @@
                                 <input type="text" class="form-control" ng-model="appInstall.location" id="appInstallLocationInput" name="location" placeholder="Leave empty to use bare domain" autofocus>
                                 <div class="input-group-btn">
                                     <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
-                                        {{ (appInstall.location ? (appInstall.domain.config.hyphenatedSubdomains ? '-' : '.') : '') + appInstall.domain.domain }}
+                                        <!-- the admin check is to check for spaces user -->
+                                        <span ng-if="user.admin">{{ (appInstall.location ? (appInstall.domain.config.hyphenatedSubdomains ? '-' : '.') : '') + appInstall.domain.domain }}</span>
+                                        <span ng-if="!user.admin">{{ (appInstall.location ? '-' : '') + user.username + '.' + appInstall.domain.domain }}</span>
                                         <span class="caret"></span>
                                     </button>
                                     <ul class="dropdown-menu dropdown-menu-right" role="menu">