diff --git a/libtransport/AdminInterface.cpp b/libtransport/AdminInterface.cpp
index ad1710064adf7e7889b23bd2b2ccaf2823d9225a..03a82a7cba69be80a85667644b7d935e8106c746 100644
--- a/libtransport/AdminInterface.cpp
+++ b/libtransport/AdminInterface.cpp
@@ -313,17 +313,12 @@ void AdminInterface::handleQuery(Swift::Message::ref message) {
 			message->setBody("Bad argument count. See 'help'.");
 		}
 	}
-	else if (message->getBody().find("get_oauth2_url ") == 0) {
+	else if (message->getBody().find("get_oauth2_url") == 0) {
 		std::string body = message->getBody();
 		std::vector<std::string> args;
 		boost::split(args, body, boost::is_any_of(" "));
-		if (args.size() == 3) {
-			std::string url = m_component->getFrontend()->getOAuth2URL(args);
-			message->setBody(url);
-		}
-		else {
-			message->setBody("Bad argument count. See 'help'.");
-		}
+		std::string url = m_component->getFrontend()->getOAuth2URL(args);
+		message->setBody(url);
 	}
 	else if (message->getBody() == "registration_fields") {
 		std::string fields = m_component->getFrontend()->getRegistrationFields();