diff --git a/src/bitmessageqt/__init__.py b/src/bitmessageqt/__init__.py
index 9a8e113f..7266d83f 100644
--- a/src/bitmessageqt/__init__.py
+++ b/src/bitmessageqt/__init__.py
@@ -4429,7 +4429,12 @@ class EmailGatewayDialog(QtGui.QDialog):
         acct = accountClass(addressAtCurrentRow)
         if isinstance(acct, GatewayAccount):
             self.ui.radioButtonUnregister.setEnabled(True)
+            self.ui.radioButtonStatus.setEnabled(True)
+            self.ui.radioButtonStatus.setChecked(True)
+            self.ui.radioButtonSettings.setEnabled(True)
         else:
+            self.ui.radioButtonStatus.setEnabled(False)
+            self.ui.radioButtonSettings.setEnabled(False)
             self.ui.radioButtonUnregister.setEnabled(False)
         label = shared.config.get(addressAtCurrentRow, 'label')
         if label.find("@mailchuck.com") > -1: