diff --git a/src/views/apps.html b/src/views/apps.html
index 61ad366a9..4e022aa11 100644
--- a/src/views/apps.html
+++ b/src/views/apps.html
@@ -22,7 +22,7 @@
                                             <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
                                                 <!-- 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 ng-if="!user.admin">{{ (!appConfigure.location ? '' : '-') + spacesSuffix + '.' + appConfigure.domain.domain }}</span>
                                                 <span class="caret"></span>
                                             </button>
                                             <ul class="dropdown-menu dropdown-menu-right" role="menu">
@@ -263,7 +263,7 @@
                               <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
                                 <!-- 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 ng-if="!user.admin">{{ (!appRestore.location ? '' : '-') + spacesSuffix + '.' + appRestore.domain.domain }}</span>
                                 <span class="caret"></span>
                               </button>
                               <ul class="dropdown-menu dropdown-menu-right" role="menu">
diff --git a/src/views/apps.js b/src/views/apps.js
index 7a1f5eab8..66e8ce5e8 100644
--- a/src/views/apps.js
+++ b/src/views/apps.js
@@ -11,6 +11,7 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
     $scope.groups = [];
     $scope.users = [];
     $scope.backupConfig = {};
+    $scope.spacesSuffix = '';
 
     $scope.appConfigure = {
         busy: false,
@@ -52,7 +53,7 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
             if ($scope.user.admin) {
                 $scope.appConfigure.location = app.location;
             } else { // strip the trailing username
-                $scope.appConfigure.location = app.location === $scope.user.username ? '' : app.location.replace(new RegExp('-' + $scope.user.username + '$'),'');
+                $scope.appConfigure.location = app.location === $scope.spacesSuffix ? '' : app.location.replace(new RegExp('-' + $scope.spacesSuffix + '$'),'');
             }
             $scope.appConfigure.domain = $scope.domains.filter(function (d) { return d.domain === app.domain; })[0];
             $scope.appConfigure.portBindingsInfo = angular.extend({}, app.manifest.tcpPorts, app.manifest.udpPorts); // Portbinding map only for information
@@ -601,6 +602,8 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
     Client.onReady(function () {
         Client.refreshInstalledApps(); // refresh the new list immediately when switching from another view (appstore)
 
+        $scope.spacesSuffix = $scope.user.username.replace(/\./g, '-');
+
         if ($scope.user.admin || $scope.config.spaces.enabled) {
             fetchUsers();
             fetchGroups();
diff --git a/src/views/appstore.html b/src/views/appstore.html
index d440a82d5..7748edde5 100644
--- a/src/views/appstore.html
+++ b/src/views/appstore.html
@@ -25,7 +25,7 @@
                                     <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
                                         <!-- 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 ng-if="!user.admin">{{ (appInstall.location ? '-' : '') + spacesSuffix + '.' + appInstall.domain.domain }}</span>
                                         <span class="caret"></span>
                                     </button>
                                     <ul class="dropdown-menu dropdown-menu-right" role="menu">
diff --git a/src/views/appstore.js b/src/views/appstore.js
index d4f4ce464..99cdf8bad 100644
--- a/src/views/appstore.js
+++ b/src/views/appstore.js
@@ -18,6 +18,7 @@ angular.module('Application').controller('AppStoreController', ['$scope', '$loca
     $scope.searchString = '';
     $scope.validAppstoreAccount = false;
     $scope.appstoreConfig = null;
+    $scope.spacesSuffix = '';
 
     $scope.showView = function (view) {
         // wait for dialog to be fully closed to avoid modal behavior breakage when moving to a different view already
@@ -526,6 +527,8 @@ angular.module('Application').controller('AppStoreController', ['$scope', '$loca
     function init() {
         $scope.ready = false;
 
+        $scope.spacesSuffix = $scope.user.username.replace(/\./g, '-');
+
         getAppList(function (error, apps) {
             if (error) {
                 console.error(error);