diff --git a/src/views/apps.html b/src/views/apps.html
index 9fa69e7f0..61ad366a9 100644
--- a/src/views/apps.html
+++ b/src/views/apps.html
@@ -261,7 +261,9 @@
                             <input type="text" class="form-control" ng-model="appRestore.location" id="appRestoreLocationInput" 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">
-                                {{ (appRestore.location ? (appRestore.domain.provider !== 'caas' ? '.' : '-') : '') + appRestore.domain.domain }}
+                                <!-- the admin check is to check for spaces user -->
+                                <span ng-if="user.admin">{{ (!appRestore.location ? '' : (appRestore.domain.config.hyphenatedSubdomains ? '-' : '.')) + appRestore.domain.domain }}</span>
+                                <span ng-if="!user.admin">{{ (!appRestore.location ? '' : '-') + user.username + '.' + appRestore.domain.domain }}</span>
                                 <span class="caret"></span>
                               </button>
                               <ul class="dropdown-menu dropdown-menu-right" role="menu">