diff --git a/spectrum/src/frontends/xmpp/settingsadhoccommand.cpp b/spectrum/src/frontends/xmpp/settingsadhoccommand.cpp
index f8b3e7d06476769a176a21612060b24f7749bdc8..5fdcff50d7f54e75dc087bfae3eca05c0c63dd04 100644
--- a/spectrum/src/frontends/xmpp/settingsadhoccommand.cpp
+++ b/spectrum/src/frontends/xmpp/settingsadhoccommand.cpp
@@ -67,11 +67,11 @@ boost::shared_ptr<Swift::Command> SettingsAdHocCommand::getForm() {
 	m_storageBackend->getUserSetting(user.id, "enable_transport", type, value);
 	FormUtils::addBooleanField(form, "enable_transport", value, "Enable transport");
 
-	value = CONFIG_STRING_DEFAULTED(m_component->getConfig(), "settings.send_headlines", "0");
+	value = CONFIG_BOOL_DEFAULTED(m_component->getConfig(), "settings.send_headlines", false) ? "1" : "0";
 	m_storageBackend->getUserSetting(user.id, "send_headlines", type, value);
 	FormUtils::addBooleanField(form, "send_headlines", value, "Allow sending messages as headlines");
 
-	value = CONFIG_STRING_DEFAULTED(m_component->getConfig(), "settings.stay_connected", "0");
+	value = CONFIG_BOOL_DEFAULTED(m_component->getConfig(), "settings.stay_connected", false) ? "1" : "0";
 	m_storageBackend->getUserSetting(user.id, "stay_connected", type, value);
 	FormUtils::addBooleanField(form, "stay_connected", value, "Stay connected to legacy network when offline on XMPP");