diff --git a/public/include/pages/account/edit.inc.php b/public/include/pages/account/edit.inc.php
index b2713a2b..68b603eb 100644
--- a/public/include/pages/account/edit.inc.php
+++ b/public/include/pages/account/edit.inc.php
@@ -23,17 +23,17 @@ if ($user->isAuthenticated()) {
   if ($config['twofactor']['enabled']) {
     $popupmsg = 'E-mail confirmations are required for ';
     $popuptypes = array();
-    if ($config['twofactor']['options']['details']) {
+    if ($config['twofactor']['options']['details'] && $oldtoken_ea !== "") {
       $popuptypes[] = 'editing your details';
       $ea_editable = $user->token->isTokenValid($_SESSION['USERDATA']['id'], $oldtoken_ea, 5);
       $ea_sent = $user->token->doesTokenExist('account_edit', $_SESSION['USERDATA']['id']);
     }
-    if ($config['twofactor']['options']['changepw']) {
+    if ($config['twofactor']['options']['changepw'] && $oldtoken_cp !== "") {
       $popuptypes[] = 'changing your password';
       $cp_editable = $user->token->isTokenValid($_SESSION['USERDATA']['id'], $oldtoken_cp, 6);
       $cp_sent = $user->token->doesTokenExist('change_pw', $_SESSION['USERDATA']['id']);
     }
-    if ($config['twofactor']['options']['withdraw']) {
+    if ($config['twofactor']['options']['withdraw'] && $oldtoken_wf !== "") {
       $popuptypes[] = 'withdrawals';
       $wf_editable = $user->token->isTokenValid($_SESSION['USERDATA']['id'], $oldtoken_wf, 7);
       $wf_sent = $user->token->doesTokenExist('withdraw_funds', $_SESSION['USERDATA']['id']);
diff --git a/public/templates/mpos/account/edit/default.tpl b/public/templates/mpos/account/edit/default.tpl
index 7687a587..cea3d882 100644
--- a/public/templates/mpos/account/edit/default.tpl
+++ b/public/templates/mpos/account/edit/default.tpl
@@ -91,11 +91,11 @@
       </p>
       <fieldset>
         <label>Account Balance</label>
-        {nocache}<input type="text" value="{$GLOBAL.userdata.balance.confirmed|escape}" {$GLOBAL.config.currency} readonly />{/nocache}
+        {nocache}<input type="text" value="{$GLOBAL.userdata.balance.confirmed|escape}" {$GLOBAL.config.currency} disabled />{/nocache}
       </fieldset>
       <fieldset>
         <label>Payout to</label>
-        {nocache}<input type="text" value="{$GLOBAL.userdata.coin_address|escape}" readonly />{/nocache}
+        {nocache}<input type="text" value="{$GLOBAL.userdata.coin_address|escape}" disabled />{/nocache}
       </fieldset>
       <fieldset>
         <label>4 digit PIN</label>