diff --git a/login_server/src/cpp/HTTPInterface/ElopageWebhook.cpp b/login_server/src/cpp/HTTPInterface/ElopageWebhook.cpp
index cfd60f649..481f35474 100644
--- a/login_server/src/cpp/HTTPInterface/ElopageWebhook.cpp
+++ b/login_server/src/cpp/HTTPInterface/ElopageWebhook.cpp
@@ -382,7 +382,7 @@ int HandleElopageRequestTask::run()
 			DataTypeConverter::strToInt(mRequestData.get("noEmail", "0"), noEMail);
 
 			if (noEMail != 1) {
-				emailVerification->setBaseUrl(newUser->getGroupBaseUrl() + "checkEmail");
+				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 450e9f087..1c84d4d12 100644
--- a/login_server/src/cpp/HTTPInterface/ResetPassword.cpp
+++ b/login_server/src/cpp/HTTPInterface/ResetPassword.cpp
@@ -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() + "checkEmail");
+					result = session->sendResetPasswordEmail(user, sendUserEmail, getBaseUrl() + "/checkEmail");
 				}
 
 				if(2 == result) {
diff --git a/login_server/src/cpp/JSONInterface/JsonAdminEmailVerificationResend.cpp b/login_server/src/cpp/JSONInterface/JsonAdminEmailVerificationResend.cpp
index 8a11a0840..fc2557cfb 100644
--- a/login_server/src/cpp/JSONInterface/JsonAdminEmailVerificationResend.cpp
+++ b/login_server/src/cpp/JSONInterface/JsonAdminEmailVerificationResend.cpp
@@ -100,7 +100,9 @@ Poco::JSON::Object* JsonAdminEmailVerificationResend::handle(Poco::Dynamic::Var
 	if (emailVerification.isNull()) {
 		return stateError("no email verification code found");
 	}
+
 	emailVerification->getModel()->insertIntoDB(false);
+	emailVerification->setBaseUrl(receiverUser->getGroupBaseUrl() + "/checkEmail");
 	em->addEmail(new model::Email(emailVerification, receiverUser, model::EMAIL_ADMIN_USER_VERIFICATION_CODE_RESEND));
 	return stateSuccess();
 
diff --git a/login_server/src/cpsp/resetPassword.cpsp b/login_server/src/cpsp/resetPassword.cpsp
index 016c266ec..03e82559a 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() + "checkEmail");
+					result = session->sendResetPasswordEmail(user, sendUserEmail, getBaseUrl() + "/checkEmail");
 				}
 
 				if(2 == result) {