diff --git a/cockatrice/src/dlg_creategame.cpp b/cockatrice/src/dlg_creategame.cpp
index 611a9fef..1db2cdd6 100644
--- a/cockatrice/src/dlg_creategame.cpp
+++ b/cockatrice/src/dlg_creategame.cpp
@@ -116,9 +116,9 @@ DlgCreateGame::DlgCreateGame(TabRoom *_room, const QMap<int, QString> &_gameType
     rememberGameSettings->setChecked(settingsCache->getRememberGameSettings());
     descriptionEdit->setText(settingsCache->getGameDescription());
     maxPlayersEdit->setValue(settingsCache->getMaxPlayers());
-    onlyBuddiesCheckBox->setChecked(settingsCache->getOnlyBuddies());
     if (room && room->getUserInfo()->user_level() & ServerInfo_User::IsRegistered)
     {
+        onlyBuddiesCheckBox->setChecked(settingsCache->getOnlyBuddies());
         onlyRegisteredCheckBox->setChecked(settingsCache->getOnlyRegistered());
     } else {
         onlyBuddiesCheckBox->setEnabled(false);
@@ -193,7 +193,7 @@ void DlgCreateGame::actReset()
 
     passwordEdit->setText("");
     onlyBuddiesCheckBox->setChecked(false);
-    onlyRegisteredCheckBox->setChecked(true);
+    onlyRegisteredCheckBox->setChecked(room && room->getUserInfo()->user_level() & ServerInfo_User::IsRegistered);
 
     spectatorsAllowedCheckBox->setChecked(true);
     spectatorsNeedPasswordCheckBox->setChecked(false);