diff --git a/include/Swiften/Server/SimpleUserRegistry.h b/include/Swiften/Server/SimpleUserRegistry.h
new file mode 100644
index 0000000000000000000000000000000000000000..324c0992a7961e239fe68b58977d5a091067026b
--- /dev/null
+++ b/include/Swiften/Server/SimpleUserRegistry.h
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2010 Remko Tronçon
+ * Licensed under the GNU General Public License v3.
+ * See Documentation/Licenses/GPLv3.txt for more information.
+ */
+
+#pragma once
+
+#include <map>
+
+#include <Swiften/JID/JID.h>
+#include <string>
+#include <Swiften/Server/UserRegistry.h>
+
+namespace Swift {
+	
+
+	class SimpleUserRegistry : public UserRegistry {
+		public:
+			SimpleUserRegistry();
+
+			virtual bool isValidUserPassword(const JID& user, const SafeByteArray& password) const;
+			void addUser(const JID& user, const std::string& password);
+
+		private:
+			std::map<JID, SafeByteArray> users;
+	};
+}