diff --git a/spectrum/src/frontends/xmpp/settingsadhoccommand.cpp b/spectrum/src/frontends/xmpp/settingsadhoccommand.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..cc93f34554cd504772d288ecdc9eef01e3c2af4e
--- /dev/null
+++ b/spectrum/src/frontends/xmpp/settingsadhoccommand.cpp
@@ -0,0 +1,128 @@
+/**
+ * XMPP - libpurple transport
+ *
+ * Copyright (C) 2012, Jan Kaluza <hanzz@soc.pidgin.im>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
+ */
+
+#include "settingsadhoccommand.h"
+#include "transport/conversation.h"
+#include "transport/usermanager.h"
+#include "transport/buddy.h"
+#include "transport/factory.h"
+#include "transport/user.h"
+#include "transport/logging.h"
+#include "transport/storagebackend.h"
+#include "formutils.h"
+
+
+namespace Transport {
+
+DEFINE_LOGGER(logger, "SettingsAdHocCommand");
+
+SettingsAdHocCommand::SettingsAdHocCommand(Component *component, UserManager *userManager, StorageBackend *storageBackend, const Swift::JID &initiator, const Swift::JID &to) : AdHocCommand(component, userManager, storageBackend, initiator, to) {
+	m_state = Init;
+}
+
+SettingsAdHocCommand::~SettingsAdHocCommand() {
+}
+
+boost::shared_ptr<Swift::Command> SettingsAdHocCommand::getForm() {
+	if (!m_storageBackend) {
+		boost::shared_ptr<Swift::Command> response(new Swift::Command("settings", m_id, Swift::Command::Completed));
+		boost::shared_ptr<Swift::Form> form(new Swift::Form());
+		FormUtils::addTextFixedField(form, "This server does not support transport settings. There is no storage backend configured");
+		response->setForm(form);
+		return response;
+	}
+
+	UserInfo user;
+	if (m_storageBackend->getUser(m_initiator.toBare().toString(), user) == false) {
+		boost::shared_ptr<Swift::Command> response(new Swift::Command("settings", m_id, Swift::Command::Completed));
+		boost::shared_ptr<Swift::Form> form(new Swift::Form());
+		FormUtils::addTextFixedField(form, "You are not registered.");
+		response->setForm(form);
+		return response;
+	}
+
+	boost::shared_ptr<Swift::Command> response(new Swift::Command("settings", m_id, Swift::Command::Executing));
+	boost::shared_ptr<Swift::Form> form(new Swift::Form());
+
+	std::string value;
+	int type = (int) TYPE_BOOLEAN;
+
+	value = "1";
+	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");
+	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");
+	m_storageBackend->getUserSetting(user.id, "stay_connected", type, value);
+	FormUtils::addBooleanField(form, "stay_connected", value, "Stay connected to legacy network when offline on XMPP");
+
+	response->setForm(form);
+	return response;
+}
+
+void SettingsAdHocCommand::updateUserSetting(Swift::Form::ref form, UserInfo &user, const std::string &name) {
+	std::string value = FormUtils::fieldValue(form, name, "");
+	if (value.empty()) {
+		return;
+	}
+
+	m_storageBackend->updateUserSetting(user.id, name, value);
+}
+
+boost::shared_ptr<Swift::Command> SettingsAdHocCommand::handleResponse(boost::shared_ptr<Swift::Command> payload) {
+	UserInfo user;
+	bool registered = m_storageBackend->getUser(m_initiator.toBare().toString(), user);
+
+	if (registered && payload->getForm()) {
+		updateUserSetting(payload->getForm(), user, "enable_transport");
+		updateUserSetting(payload->getForm(), user, "send_headlines");
+		updateUserSetting(payload->getForm(), user, "stay_connected");
+	}
+
+	boost::shared_ptr<Swift::Command> response(new Swift::Command("settings", m_id, Swift::Command::Completed));
+	return response;
+}
+
+boost::shared_ptr<Swift::Command> SettingsAdHocCommand::handleRequest(boost::shared_ptr<Swift::Command> payload) {
+	boost::shared_ptr<Swift::Command> response;
+	if (payload->getAction() == Swift::Command::Cancel) {
+		response = boost::shared_ptr<Swift::Command>(new Swift::Command("settings", m_id, Swift::Command::Canceled));
+		return response;
+	}
+
+	switch (m_state) {
+		case Init:
+			response = getForm();
+			m_state = WaitingForResponse;
+			break;
+		case WaitingForResponse:
+			response = handleResponse(payload);
+			break;
+		default:
+			break;
+	}
+	
+	return response;
+}
+
+}