diff --git a/login_server/src/cpp/JSONInterface/JsonCreateUser.cpp b/login_server/src/cpp/JSONInterface/JsonCreateUser.cpp
index c66d10c8d..4917f611a 100644
--- a/login_server/src/cpp/JSONInterface/JsonCreateUser.cpp
+++ b/login_server/src/cpp/JSONInterface/JsonCreateUser.cpp
@@ -109,7 +109,7 @@ Poco::JSON::Object* JsonCreateUser::handle(Poco::Dynamic::Var params)
 		emailOptInModel->sendErrorsAsEmail();
 		return stateError("insert emailOptIn failed");
 	}
-
+	emailOptIn->setBaseUrl(mServerHost + "/" + ServerConfig::g_frontend_checkEmailPath);
 	em->addEmail(new model::Email(emailOptIn, user, model::Email::convertTypeFromInt(emailType)));
 
 	if (login_after_register && session) {
diff --git a/login_server/src/cpp/JSONInterface/JsonRequestHandler.cpp b/login_server/src/cpp/JSONInterface/JsonRequestHandler.cpp
index 99b4eb0fe..a577155b9 100644
--- a/login_server/src/cpp/JSONInterface/JsonRequestHandler.cpp
+++ b/login_server/src/cpp/JSONInterface/JsonRequestHandler.cpp
@@ -43,7 +43,13 @@ void JsonRequestHandler::handleRequest(Poco::Net::HTTPServerRequest& request, Po
 	//std::ostream& responseStream = _compressResponse ? _gzipStream : _responseStream;
 
 	mClientIp = request.clientAddress().host();
-
+	
+	if (request.secure()) {
+		mServerHost = "https://" + request.getHost();
+	}
+	else {
+		mServerHost = "http://" + request.getHost();
+	}
 	auto method = request.getMethod();
 	std::istream& request_stream = request.stream();
 	Poco::JSON::Object* json_result = nullptr;
diff --git a/login_server/src/cpp/JSONInterface/JsonRequestHandler.h b/login_server/src/cpp/JSONInterface/JsonRequestHandler.h
index ed0272ac8..834ac512e 100644
--- a/login_server/src/cpp/JSONInterface/JsonRequestHandler.h
+++ b/login_server/src/cpp/JSONInterface/JsonRequestHandler.h
@@ -26,6 +26,7 @@ public:
 protected:
 	Poco::JSON::Object* mResultJson;
 	Poco::Net::IPAddress mClientIp;
+	std::string			mServerHost;
 	Session*			 mSession;
 
 	Poco::JSON::Object* checkAndLoadSession(Poco::Dynamic::Var params, bool checkIp = false);
diff --git a/login_server/src/cpp/JSONInterface/JsonSendEmail.cpp b/login_server/src/cpp/JSONInterface/JsonSendEmail.cpp
index 9228c31cb..3179d81ce 100644
--- a/login_server/src/cpp/JSONInterface/JsonSendEmail.cpp
+++ b/login_server/src/cpp/JSONInterface/JsonSendEmail.cpp
@@ -105,12 +105,12 @@ Poco::JSON::Object* JsonSendEmail::handle(Poco::Dynamic::Var params)
 		return stateError("invalid email");
 	}
 	auto receiver_user_id = receiver_user->getModel()->getID();
-	
+	std::string checkEmailUrl = receiver_user->getGroupBaseUrl() + ServerConfig::g_frontend_checkEmailPath;
 	if (emailVerificationCodeType == model::table::EMAIL_OPT_IN_RESET_PASSWORD) 
 	{
 		session = sm->getNewSession();
 		if (emailType == model::EMAIL_USER_RESET_PASSWORD) {
-			auto r = session->sendResetPasswordEmail(receiver_user, true, receiver_user->getGroupBaseUrl());
+			auto r = session->sendResetPasswordEmail(receiver_user, true, checkEmailUrl);
 			if (1 == r) {
 				return stateWarning("email already sended");
 			}
@@ -120,6 +120,7 @@ Poco::JSON::Object* JsonSendEmail::handle(Poco::Dynamic::Var params)
 		}
 		else if (emailType == model::EMAIL_CUSTOM_TEXT) {
 			auto email_verification_code_object = controller::EmailVerificationCode::loadOrCreate(receiver_user_id, model::table::EMAIL_OPT_IN_RESET_PASSWORD);
+			email_verification_code_object->setBaseUrl(checkEmailUrl);
 			auto email = new model::Email(email_verification_code_object, receiver_user, emailCustomText, emailCustomSubject);
 			em->addEmail(email);
 		}
@@ -135,6 +136,7 @@ Poco::JSON::Object* JsonSendEmail::handle(Poco::Dynamic::Var params)
 		}
 		
 		auto email_verification_code_object = controller::EmailVerificationCode::loadOrCreate(receiver_user_id, emailVerificationCodeType);
+		email_verification_code_object->setBaseUrl(checkEmailUrl);
 		model::Email* email = nullptr;
 		if (emailType == model::EMAIL_CUSTOM_TEXT) {
 			email = new model::Email(email_verification_code_object, receiver_user, emailCustomText, emailCustomSubject);
diff --git a/login_server/src/cpp/controller/EmailVerificationCode.cpp b/login_server/src/cpp/controller/EmailVerificationCode.cpp
index d685fd925..16fcefbb8 100644
--- a/login_server/src/cpp/controller/EmailVerificationCode.cpp
+++ b/login_server/src/cpp/controller/EmailVerificationCode.cpp
@@ -122,10 +122,7 @@ namespace controller {
 	std::string EmailVerificationCode::getLink()
 	{
 		std::string link = mBaseUrl;
-		if (ServerConfig::g_frontend_checkEmailPath.size() > 1 && ServerConfig::g_frontend_checkEmailPath.data()[0] != '/') {
-			link += '/';
-		}
-		link += ServerConfig::g_frontend_checkEmailPath;
+		
 		if (link.data()[link.size() - 1] != '/') {
 			link += '/';
 		}