From a49f601abb852edc457e0161c5debad2cb422fa9 Mon Sep 17 00:00:00 2001
From: einhornimmond <dario.rekowski@gmx.de>
Date: Thu, 13 May 2021 18:42:34 +0200
Subject: [PATCH] fix old password reset function

---
 .../src/cpp/HTTPInterface/ElopageWebhook.cpp  |  1 +
 .../src/cpp/HTTPInterface/ResetPassword.cpp   | 98 +++++++++----------
 login_server/src/cpsp/resetPassword.cpsp      |  2 +-
 3 files changed, 51 insertions(+), 50 deletions(-)

diff --git a/login_server/src/cpp/HTTPInterface/ElopageWebhook.cpp b/login_server/src/cpp/HTTPInterface/ElopageWebhook.cpp
index 67b6fa0d0..cfd60f649 100644
--- a/login_server/src/cpp/HTTPInterface/ElopageWebhook.cpp
+++ b/login_server/src/cpp/HTTPInterface/ElopageWebhook.cpp
@@ -382,6 +382,7 @@ int HandleElopageRequestTask::run()
 			DataTypeConverter::strToInt(mRequestData.get("noEmail", "0"), noEMail);
 
 			if (noEMail != 1) {
+				emailVerification->setBaseUrl(newUser->getGroupBaseUrl() + "checkEmail");
 				em->addEmail(new model::Email(emailVerification, newUser, model::EMAIL_USER_VERIFICATION_CODE));
 			}
 		}
diff --git a/login_server/src/cpp/HTTPInterface/ResetPassword.cpp b/login_server/src/cpp/HTTPInterface/ResetPassword.cpp
index 5b5b95721..450e9f087 100644
--- a/login_server/src/cpp/HTTPInterface/ResetPassword.cpp
+++ b/login_server/src/cpp/HTTPInterface/ResetPassword.cpp
@@ -5,7 +5,7 @@
 #include "Poco/DeflatingStream.h"
 
 
-#line 6 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp"
+#line 6 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\resetPassword.cpsp"
 
 #include "../SingletonManager/LanguageManager.h"
 #include "../SingletonManager/SessionManager.h"
@@ -20,7 +20,7 @@ enum PageState {
 	PAGE_WAIT_ADMIN,
 	PAGE_EMAIL_ALREADY_SEND
 };
-#line 1 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
+#line 1 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\header.cpsp"
 
 #include "../ServerConfig.h"
 
@@ -33,7 +33,7 @@ void ResetPassword::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::N
 	if (_compressResponse) response.set("Content-Encoding", "gzip");
 
 	Poco::Net::HTMLForm form(request, request.stream());
-#line 20 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp"
+#line 20 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\resetPassword.cpsp"
 
 	PageState state = PAGE_EMAIL_ASK;
 	auto lm = LanguageManager::getInstance();
@@ -95,7 +95,7 @@ void ResetPassword::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::N
 				// send reset password email
 				int result = 0;
 				if(user_exist) {
-					result = session->sendResetPasswordEmail(user, sendUserEmail, getBaseUrl());
+					result = session->sendResetPasswordEmail(user, sendUserEmail, getBaseUrl() + "checkEmail");
 				}
 
 				if(2 == result) {
@@ -116,7 +116,7 @@ void ResetPassword::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::N
 	}
 
 
-#line 3 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
+#line 3 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\header.cpsp"
 
 	bool withMaterialIcons = false;
 	std::ostream& _responseStream = response.send();
@@ -131,20 +131,20 @@ void ResetPassword::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::N
 	responseStream << "<meta charset=\"UTF-8\">\n";
 	responseStream << "<meta name=\"viewport\" content=\"width=device-width, initial-scale=1, shrink-to-fit=no\">\n";
 	responseStream << "<title>Gradido Login Server: ";
-#line 11 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
+#line 11 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\header.cpsp"
 	responseStream << ( pageName );
 	responseStream << "</title>\n";
 	responseStream << "<link rel=\"stylesheet\" type=\"text/css\" href=\"";
-#line 12 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
+#line 12 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\header.cpsp"
 	responseStream << ( ServerConfig::g_php_serverPath );
 	responseStream << "css/main.css\">\n";
-#line 13 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
+#line 13 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\header.cpsp"
  if(withMaterialIcons) { 	responseStream << "\n";
 	responseStream << "<link rel=\"stylesheet\" type=\"text/css\" href=\"";
-#line 14 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
+#line 14 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\header.cpsp"
 	responseStream << ( ServerConfig::g_php_serverPath );
 	responseStream << "css/materialdesignicons.min.css\">\n";
-#line 15 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
+#line 15 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\header.cpsp"
  } 	responseStream << "\n";
 	responseStream << "</head>\n";
 	responseStream << "<body>\n";
@@ -152,20 +152,20 @@ void ResetPassword::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::N
 	responseStream << "        <div class=\"center-form-single\">\n";
 	responseStream << "            <div class=\"center-form-header\">\n";
 	responseStream << "                <a href=\"";
-#line 21 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
+#line 21 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\header.cpsp"
 	responseStream << ( ServerConfig::g_php_serverPath );
 	responseStream << "\" class=\"center-logo\">\n";
 	responseStream << "                    <picture>\n";
 	responseStream << "                        <source srcset=\"";
-#line 23 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
+#line 23 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\header.cpsp"
 	responseStream << ( ServerConfig::g_php_serverPath );
 	responseStream << "img/logo_schrift.webp\" type=\"image/webp\">\n";
 	responseStream << "                        <source srcset=\"";
-#line 24 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
+#line 24 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\header.cpsp"
 	responseStream << ( ServerConfig::g_php_serverPath );
 	responseStream << "img/logo_schrift.png\" type=\"image/png\">\n";
 	responseStream << "                        <img src=\"";
-#line 25 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
+#line 25 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\header.cpsp"
 	responseStream << ( ServerConfig::g_php_serverPath );
 	responseStream << "img/logo_schrift.png\" alt=\"logo\" />\n";
 	responseStream << "                    </picture>\n";
@@ -174,7 +174,7 @@ void ResetPassword::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::N
 	// end include header.cpsp
 	responseStream << "\n";
 	responseStream << "        ";
-#line 103 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp"
+#line 103 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\resetPassword.cpsp"
 	responseStream << ( getErrorsHtml() );
 	responseStream << "\n";
 	responseStream << "\t    <div class=\"center-form-container\">\n";
@@ -182,36 +182,36 @@ void ResetPassword::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::N
 	responseStream << "\t            <h1>Passwort zurücksetzen</h1>\n";
 	responseStream << "\t        </div>\n";
 	responseStream << "    ";
-#line 108 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp"
+#line 108 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\resetPassword.cpsp"
  if(state == PAGE_EMAIL_ASK) { 	responseStream << "\n";
 	responseStream << "            <div class=\"center-form-form\">\n";
 	responseStream << "\t\t\t\t<form action=\"";
-#line 110 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp"
+#line 110 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\resetPassword.cpsp"
 	responseStream << ( getBaseUrl() );
 	responseStream << "/resetPassword\">\n";
 	responseStream << "\t\t\t\t\t<div class=\"item-wrapper\">\n";
 	responseStream << "\t\t\t\t\t  <div class=\"form-group\">\n";
 	responseStream << "\t\t\t\t\t\t<label class=\"form-label\" for=\"email\">";
-#line 113 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp"
+#line 113 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\resetPassword.cpsp"
 	responseStream << ( langCatalog->gettext("Gib bitte hier deine E-Mail Adresse an:") );
 	responseStream << "</label>\n";
 	responseStream << "\t\t\t\t\t\t<input class=\"form-control\" type=\"text\" class=\"";
-#line 114 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp"
+#line 114 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\resetPassword.cpsp"
 	responseStream << ( emailInputClass );
 	responseStream << "\" name=\"email\" id=\"email\" placeholder=\"E-Mail\" value=\"";
-#line 114 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp"
+#line 114 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\resetPassword.cpsp"
 	responseStream << ( email );
 	responseStream << "\">\n";
 	responseStream << "\t\t\t\t\t  </div>\n";
 	responseStream << "\t\t\t\t\t  <button type=\"submit\" class=\"center-form-submit form-button\" >";
-#line 116 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp"
+#line 116 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\resetPassword.cpsp"
 	responseStream << ( langCatalog->gettext("Bestätigen") );
 	responseStream << "</button>\n";
 	responseStream << "\t\t\t\t\t</div>\n";
 	responseStream << "\t\t\t\t</form>\n";
 	responseStream << "\t\t\t</div>\n";
 	responseStream << "\t";
-#line 120 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp"
+#line 120 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\resetPassword.cpsp"
  } else if(state == PAGE_ASK) { 	responseStream << "\n";
 	responseStream << "            <div class=\"center-form-form\">\n";
 	responseStream << "\t\t\t\t";
@@ -219,22 +219,22 @@ void ResetPassword::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::N
 	responseStream << "<div class=\"center-form-selectors\">\n";
 	responseStream << "<form method=\"GET\" action=\"\">\n";
 	responseStream << "\t<button id=\"flag-england\" name=\"lang\" value=\"en\" title=\"English\" type=\"submit\" ";
-#line 3 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\flags.cpsp"
+#line 3 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\flags.cpsp"
  if(lang != LANG_EN) { 	responseStream << "class=\"flag-btn\"";
-#line 3 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\flags.cpsp"
+#line 3 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\flags.cpsp"
  }
 	else { 	responseStream << "class=\"flag-btn\" disabled";
-#line 4 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\flags.cpsp"
+#line 4 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\flags.cpsp"
  } 	responseStream << ">\n";
 	responseStream << "\t  <span class=\"flag flag-england\"></span>\n";
 	responseStream << "\t</button>\n";
 	responseStream << "\t<button id=\"flag-germany\" name=\"lang\" value=\"de\" title=\"Deutsch\" type=\"submit\" ";
-#line 7 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\flags.cpsp"
+#line 7 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\flags.cpsp"
  if(lang != LANG_DE) { 	responseStream << "class=\"flag-btn\"";
-#line 7 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\flags.cpsp"
+#line 7 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\flags.cpsp"
  }
 	else { 	responseStream << "class=\"flag-btn\" disabled";
-#line 8 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\flags.cpsp"
+#line 8 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\flags.cpsp"
  } 	responseStream << ">\n";
 	responseStream << "\t  <span class=\"flag flag-germany\"></span>\n";
 	responseStream << "\t</button>\n";
@@ -243,33 +243,33 @@ void ResetPassword::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::N
 	// end include flags.cpsp
 	responseStream << "\n";
 	responseStream << "\t\t\t\t<form action=\"";
-#line 123 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp"
+#line 123 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\resetPassword.cpsp"
 	responseStream << ( getBaseUrl() );
 	responseStream << "/resetPassword\">\n";
 	responseStream << "\t\t\t\t\t<label class=\"form-label\" for=\"email\">";
-#line 124 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp"
+#line 124 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\resetPassword.cpsp"
 	responseStream << ( langCatalog->gettext("Gib bitte hier deine E-Mail Adresse an:") );
 	responseStream << "</label>\n";
 	responseStream << "\t\t\t\t\t<input class=\"form-control\" type=\"text\" class=\"";
-#line 125 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp"
+#line 125 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\resetPassword.cpsp"
 	responseStream << ( emailInputClass );
 	responseStream << "\" name=\"email\" id=\"email\" placeholder=\"E-Mail\" value=\"";
-#line 125 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp"
+#line 125 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\resetPassword.cpsp"
 	responseStream << ( email );
 	responseStream << "\">\n";
 	responseStream << "\t\t\t\t\t<label>";
-#line 126 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp"
+#line 126 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\resetPassword.cpsp"
 	responseStream << ( langCatalog->gettext("Hast du dir deine Passphrase notiert oder gemerkt?") );
 	responseStream << "</label>\n";
 	responseStream << "\t\t\t\t\t<input class=\"form-control\" type=\"hidden\" name=\"ask_passphrase\" value=\"true\">\n";
 	responseStream << "\t\t\t\t\t<div class=\"";
-#line 128 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp"
+#line 128 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\resetPassword.cpsp"
 	responseStream << ( passphraseRadioClass );
 	responseStream << "\">\n";
 	responseStream << "\t\t\t\t\t\t<div class=\"radio\">\n";
 	responseStream << "\t\t\t\t\t\t  <label class=\"form-label\" class=\"radio-label mr-4\">\n";
 	responseStream << "\t\t\t\t\t\t\t<input class=\"form-control\" name=\"passphrase_memorized\" onclick=\"removeGroupInvalidClass()\"  type=\"radio\" value=\"true\">";
-#line 131 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp"
+#line 131 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\resetPassword.cpsp"
 	responseStream << ( langCatalog->gettext("Ja") );
 	responseStream << " <i class=\"input-frame\"></i>\n";
 	responseStream << "\t\t\t\t\t\t  </label>\n";
@@ -277,53 +277,53 @@ void ResetPassword::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::N
 	responseStream << "\t\t\t\t\t\t<div class=\"radio\">\n";
 	responseStream << "\t\t\t\t\t\t  <label class=\"form-label\" class=\"radio-label\">\n";
 	responseStream << "\t\t\t\t\t\t\t<input class=\"form-control\" name=\"passphrase_memorized\" onclick=\"removeGroupInvalidClass()\" type=\"radio\" value=\"false\">";
-#line 136 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp"
+#line 136 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\resetPassword.cpsp"
 	responseStream << ( langCatalog->gettext("Nein") );
 	responseStream << " <i class=\"input-frame\"></i>\n";
 	responseStream << "\t\t\t\t\t\t  </label>\n";
 	responseStream << "\t\t\t\t\t\t</div>\n";
 	responseStream << "\t\t\t\t\t</div>\n";
 	responseStream << "\t\t\t\t\t  <button type=\"submit\" class=\"center-form-submit form-button\" name=\"ask\" >";
-#line 140 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp"
+#line 140 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\resetPassword.cpsp"
 	responseStream << ( langCatalog->gettext("Absenden") );
 	responseStream << "</button>\n";
 	responseStream << "\t\t\t\t\t</div>\n";
 	responseStream << "\t\t\t\t</form>\n";
 	responseStream << "\t\t\t</div>\n";
 	responseStream << "\t  ";
-#line 144 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp"
+#line 144 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\resetPassword.cpsp"
  } else if(state == PAGE_WAIT_EMAIL) { 	responseStream << "\n";
 	responseStream << "\t\t\t";
-#line 145 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp"
+#line 145 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\resetPassword.cpsp"
 	responseStream << ( langCatalog->gettext("Dir wird eine E-Mail zugeschickt um dein Passwort zur&uuml;ckzusetzen.") );
 	responseStream << "\n";
 	responseStream << "\t  ";
-#line 146 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp"
+#line 146 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\resetPassword.cpsp"
  } else if(state == PAGE_WAIT_ADMIN) { 	responseStream << "\n";
 	responseStream << "\t\t\t";
-#line 147 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp"
+#line 147 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\resetPassword.cpsp"
 	responseStream << ( langCatalog->gettext("Der Admin hat eine E-Mail bekommen und wird sich bei dir melden.") );
 	responseStream << "\n";
 	responseStream << "\t  ";
-#line 148 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp"
+#line 148 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\resetPassword.cpsp"
  } else if(state == PAGE_EMAIL_ALREADY_SEND) { 	responseStream << "\n";
 	responseStream << "\t\t\t<p>";
-#line 149 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp"
+#line 149 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\resetPassword.cpsp"
 	responseStream << ( langCatalog->gettext("Du hast bereits eine E-Mail bekommen. Bitte schau auch in dein Spam-Verzeichnis nach. ") );
 	responseStream << "</p>\n";
 	responseStream << "\t\t\t<p>";
-#line 150 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp"
+#line 150 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\resetPassword.cpsp"
 	responseStream << ( langCatalog->gettext("Du hast wirklich keine E-Mail erhalten und auch schon ein paar Minuten gewartet?") );
 	responseStream << "</p>\n";
 	responseStream << "\t\t\t<p><b><a href=\"mailto:";
-#line 151 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp"
+#line 151 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\resetPassword.cpsp"
 	responseStream << ( adminReceiver );
 	responseStream << "?subject=Error Reset Password email&amp;body=Hallo Dario,%0D%0A%0D%0Aich habe keine Passwort zurücksetzen E-Mail erhalten,%0D%0Akannst du das prüfen?%0D%0A%0D%0AMit freundlichen Grüßen%0D%0A\">";
-#line 151 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp"
+#line 151 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\resetPassword.cpsp"
 	responseStream << ( langCatalog->gettext("E-Mail an Support schicken"));
 	responseStream << "</a></b></p>\n";
 	responseStream << "\t  ";
-#line 152 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\resetPassword.cpsp"
+#line 152 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\resetPassword.cpsp"
  } 	responseStream << "\n";
 	responseStream << "          </div>\n";
 	responseStream << "          </div>\n";
@@ -345,14 +345,14 @@ void ResetPassword::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::N
 	responseStream << "        </div>\n";
 	responseStream << "        <div class=\"bottomleft\">\n";
 	responseStream << "            ";
-#line 6 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\footer.cpsp"
+#line 6 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\footer.cpsp"
 	responseStream << ( mTimeProfiler.string() );
 	responseStream << "\n";
 	responseStream << "        </div>\n";
 	responseStream << "        <div class=\"bottomright\">\n";
 	responseStream << "            <p>Login Server in Entwicklung</p>\n";
 	responseStream << "            <p>Alpha ";
-#line 10 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\footer.cpsp"
+#line 10 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\footer.cpsp"
 	responseStream << ( ServerConfig::g_versionString );
 	responseStream << "</p>\n";
 	responseStream << "        </div>\n";
diff --git a/login_server/src/cpsp/resetPassword.cpsp b/login_server/src/cpsp/resetPassword.cpsp
index 3f90daf2d..016c266ec 100644
--- a/login_server/src/cpsp/resetPassword.cpsp
+++ b/login_server/src/cpsp/resetPassword.cpsp
@@ -78,7 +78,7 @@ enum PageState {
 				// send reset password email
 				int result = 0;
 				if(user_exist) {
-					result = session->sendResetPasswordEmail(user, sendUserEmail, getBaseUrl());
+					result = session->sendResetPasswordEmail(user, sendUserEmail, getBaseUrl() + "checkEmail");
 				}
 
 				if(2 == result) {