diff --git a/spectrum/src/frontends/slack/SlackUserRegistration.cpp b/spectrum/src/frontends/slack/SlackUserRegistration.cpp
index 958549247e64f9372b12ebfb8849d2b3a8154cad..12143ee1da318fe3c68d1f39fecfff44a0742705 100644
--- a/spectrum/src/frontends/slack/SlackUserRegistration.cpp
+++ b/spectrum/src/frontends/slack/SlackUserRegistration.cpp
@@ -112,6 +112,8 @@ std::string SlackUserRegistration::handleOAuth2Code(const std::string &code, con
 	std::string token;
 	std::string access_token;
 	std::vector<std::string> data;
+	std::string value;
+	int type = (int) TYPE_STRING;
 
 	if (state == "use_bot_token") {
 		token = code;
@@ -148,6 +150,7 @@ std::string SlackUserRegistration::handleOAuth2Code(const std::string &code, con
 	user.id = 0;
 	m_storageBackend->getUser(domain, user);
 
+	value = user.jid;
 	user.jid = domain;
 	user.language = "en";
 	user.encoding = "";
@@ -157,8 +160,11 @@ std::string SlackUserRegistration::handleOAuth2Code(const std::string &code, con
 
 	m_storageBackend->getUser(user.jid, user);
 
-	std::string value = token;
-	int type = (int) TYPE_STRING;
+	if (!value.empty()) {
+		m_storageBackend->getUserSetting(user.id, "slack_channel", type, value);
+	}
+
+	value = token;
 	m_storageBackend->getUserSetting(user.id, "bot_token", type, value);
 
 	value = access_token;