diff --git a/src/storageresponder.cpp b/src/storageresponder.cpp
index 0a143ea5571a5b02baaa6d61c4844c8f52cb1aca..84423593ea045ad3249fc3edeeb740a8b4df94b7 100644
--- a/src/storageresponder.cpp
+++ b/src/storageresponder.cpp
@@ -27,12 +27,17 @@
 #include "Swiften/Swiften.h"
 #include "transport/usermanager.h"
 #include "transport/user.h"
+#include "log4cxx/logger.h"
+
+using namespace log4cxx;
 
 using namespace Swift;
 using namespace boost;
 
 namespace Transport {
 
+static LoggerPtr logger = Logger::getLogger("StorageResponder");
+
 StorageResponder::StorageResponder(Swift::IQRouter *router, StorageBackend *storageBackend, UserManager *userManager) : Swift::Responder<PrivateStorage>(router) {
 	m_storageBackend = storageBackend;
 	m_userManager = userManager;
@@ -44,6 +49,7 @@ StorageResponder::~StorageResponder() {
 bool StorageResponder::handleGetRequest(const Swift::JID& from, const Swift::JID& to, const std::string& id, boost::shared_ptr<Swift::PrivateStorage> payload) {
 	User *user = m_userManager->getUser(from.toBare().toString());
 	if (!user) {
+		LOG4CXX_WARN(logger, from.toBare().toString() << ": User is not logged in");
 		sendError(from, id, ErrorPayload::NotAcceptable, ErrorPayload::Cancel);
 		return true;
 	}
@@ -51,7 +57,7 @@ bool StorageResponder::handleGetRequest(const Swift::JID& from, const Swift::JID
 	int type = 0;
 	std::string value = "";
 	m_storageBackend->getUserSetting(user->getUserInfo().id, "storage", type, value);
-	std::cout << value << "\n";
+	LOG4CXX_INFO(logger, from.toBare().toString() << ": Sending jabber:iq:storage");
 
 	sendResponse(from, id, boost::shared_ptr<PrivateStorage>(new PrivateStorage(boost::shared_ptr<RawXMLPayload>(new RawXMLPayload(value)))));
 	return true;
@@ -61,12 +67,14 @@ bool StorageResponder::handleSetRequest(const Swift::JID& from, const Swift::JID
 	User *user = m_userManager->getUser(from.toBare().toString());
 	if (!user) {
 		sendError(from, id, ErrorPayload::NotAcceptable, ErrorPayload::Cancel);
+		LOG4CXX_WARN(logger, from.toBare().toString() << ": User is not logged in");
 		return true;
 	}
 
 	StorageSerializer serializer;
 	std::string value = serializer.serializePayload(boost::dynamic_pointer_cast<Storage>(payload->getPayload()));
 	m_storageBackend->updateUserSetting(user->getUserInfo().id, "storage", value);
+	LOG4CXX_INFO(logger, from.toBare().toString() << ": Storing jabber:iq:storage");
 	sendResponse(from, id, boost::shared_ptr<PrivateStorage>());
 	return true;
 }