diff --git a/config.js b/config.js
index 5737c3dfc..18f6b3069 100644
--- a/config.js
+++ b/config.js
@@ -69,5 +69,9 @@ var config = {
     'During that time service will not be available. ' +
     'Apologise for inconvenience.',*/
     disableThirdPartyRequests: false,
-    minHDHeight: 540
+    minHDHeight: 540,
+    // If true - all users without token will be considered guests and all users
+    // with token will be considered non-guests. Only guests will be allowed to
+    // edit their profile.
+    enableUserRolesBasedOnToken: false
 };
diff --git a/modules/TokenData/TokenData.js b/modules/TokenData/TokenData.js
index 64aacf7a1..313a4850e 100644
--- a/modules/TokenData/TokenData.js
+++ b/modules/TokenData/TokenData.js
@@ -65,9 +65,12 @@ class TokenData{
      * @param {string} the JWT token
      */
     constructor(jwt) {
+        this.isGuest = true;
         if(!jwt)
             return;
 
+        this.isGuest = config.enableUserRolesBasedOnToken !== true;
+
         this.jwt = jwt;
 
         //External API settings
diff --git a/modules/UI/UI.js b/modules/UI/UI.js
index 722304fcd..568fbd2ba 100644
--- a/modules/UI/UI.js
+++ b/modules/UI/UI.js
@@ -367,7 +367,8 @@ function registerListeners() {
     UI.addListener(UIEvents.TOGGLE_CONTACT_LIST, UI.toggleContactList);
 
     UI.addListener( UIEvents.TOGGLE_PROFILE, function() {
-        UI.toggleSidePanel("profile_container");
+        if(APP.tokenData.isGuest)
+            UI.toggleSidePanel("profile_container");
     });
 
     UI.addListener(UIEvents.TOGGLE_FILM_STRIP, UI.handleToggleFilmStrip);