diff --git a/login_server/src/cpp/HTTPInterface/PageRequestMessagedHandler.cpp b/login_server/src/cpp/HTTPInterface/PageRequestMessagedHandler.cpp
index 3403e06a9..a5d6740a0 100644
--- a/login_server/src/cpp/HTTPInterface/PageRequestMessagedHandler.cpp
+++ b/login_server/src/cpp/HTTPInterface/PageRequestMessagedHandler.cpp
@@ -83,4 +83,12 @@ std::string PageRequestMessagedHandler::getBaseUrl()
 		return "http://" + mHost + mLoginServerPath;
 	}
 	return "https://" + mHost + mLoginServerPath; 
+}
+
+std::string PageRequestMessagedHandler::getHost()
+{
+	if (ServerConfig::g_ServerSetupType == ServerConfig::SERVER_TYPE_TEST) {
+		return "http://" + mHost;
+	}
+	return "https://" + mHost;
 }
\ No newline at end of file
diff --git a/login_server/src/cpp/HTTPInterface/PageRequestMessagedHandler.h b/login_server/src/cpp/HTTPInterface/PageRequestMessagedHandler.h
index 587aad77f..9e30f1a7f 100644
--- a/login_server/src/cpp/HTTPInterface/PageRequestMessagedHandler.h
+++ b/login_server/src/cpp/HTTPInterface/PageRequestMessagedHandler.h
@@ -29,6 +29,7 @@ protected:
 
 	unsigned long long getLastGetAsU64(const std::string& uri);
 	std::string getBaseUrl();
+	std::string getHost();
 
 	Profiler mTimeProfiler;
 	std::string mHost;
diff --git a/login_server/src/cpsp/Login.cpsp b/login_server/src/cpsp/Login.cpsp
index 8a198a91e..6ddd8a066 100644
--- a/login_server/src/cpsp/Login.cpsp
+++ b/login_server/src/cpsp/Login.cpsp
@@ -299,7 +299,7 @@
 		  </a>
 	    </div>
 		<div class="reset-pwd-link">
-			<a href="<%= getBaseUrl() %>/resetPassword"><%= langCatalog->gettext("Passwort vergessen") %></a>
+			<a href="<%= getHost() %>/vue/password"><%= langCatalog->gettext("Passwort vergessen") %></a>
 		</div>
 	</div>
 </div>