diff --git a/libtransport/AdminInterface.cpp b/libtransport/AdminInterface.cpp
index 7eaaeb71285a1bbb3cda97dd3296a38ff73ec529..3527c8b6f7f50d9e917c5abd1df6816e29d90cb1 100644
--- a/libtransport/AdminInterface.cpp
+++ b/libtransport/AdminInterface.cpp
@@ -273,10 +273,10 @@ void AdminInterface::handleQuery(Swift::Message::ref message) {
 			res.jid = args[1];
 			res.uin = args[2];
 			if (args.size() == 3) {
-				res.password = args[3];
+				res.password = "";
 			}
 			else {
-				res.password = args[4];
+				res.password = args[3];
 			}
 			res.language = "en";
 			res.encoding = "utf-8";