diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index df7a0ccb1..7ae0b4a61 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -1650,7 +1650,7 @@ define([
         var $displayedName = $('<span>', {'class': displayNameCls});
 
         var priv = metadataMgr.getPrivateData();
-        var accountName = priv.accountName;
+        var accountName = Util.fixHTML(priv.accountName);
         var origin = priv.origin;
         var padType = metadataMgr.getMetadata().type;
 
@@ -1660,7 +1660,8 @@ define([
             var $userAdminContent = $('<p>');
             if (accountName) {
                 var $userAccount = $('<span>').append(Messages.user_accountName + ': ');
-                $userAdminContent.append($userAccount).append(Util.fixHTML(accountName));
+
+                $userAdminContent.append($userAccount).append(accountName);
                 $userAdminContent.append($('<br>'));
             }
             if (config.displayName && !AppConfig.disableProfile) {
diff --git a/www/common/sframe-common.js b/www/common/sframe-common.js
index 6c77fc8f9..4da01a0dd 100644
--- a/www/common/sframe-common.js
+++ b/www/common/sframe-common.js
@@ -448,7 +448,7 @@ define([
         }
     };
     funcs.createPad = function (cfg, cb) {
-        var priv = ctx.metadataMgr.getPrivateData();
+        //var priv = ctx.metadataMgr.getPrivateData();
         if (AppConfig.disableAnonymousPadCreation && !funcs.isLoggedIn()) {
             return void UI.errorLoadingScreen(Messages.mustLogin);
         }