diff --git a/management/mailconfig.py b/management/mailconfig.py
index 491a4d5c..6e31eae8 100755
--- a/management/mailconfig.py
+++ b/management/mailconfig.py
@@ -557,10 +557,12 @@ def get_mfa_state(email, env):
 	if credential_row is None:
 		return { 'type': None }
 
+	secret, mru_token = credential_row
+
 	return {
 		'type': 'totp',
-		'secret': credential_row[0],
-		'mru_token': credential_row[1]
+		'secret': secret,
+		'mru_token': '' if mru_token is None else mru_token
 	}
 
 def create_totp_credential(email, secret, token, env):