diff --git a/dependencies/iroha-ed25519 b/dependencies/iroha-ed25519
index 7307ffb8a..a0977c22d 160000
--- a/dependencies/iroha-ed25519
+++ b/dependencies/iroha-ed25519
@@ -1 +1 @@
-Subproject commit 7307ffb8a89d2459f0c07ea5cab27c0d3496df00
+Subproject commit a0977c22d23f7e8cb596f1d9d812de74115f407b
diff --git a/src/cpp/HTTPInterface/PageRequestHandlerFactory.cpp b/src/cpp/HTTPInterface/PageRequestHandlerFactory.cpp
index d9e7e1179..1c63515c0 100644
--- a/src/cpp/HTTPInterface/PageRequestHandlerFactory.cpp
+++ b/src/cpp/HTTPInterface/PageRequestHandlerFactory.cpp
@@ -38,6 +38,7 @@ Poco::Net::HTTPRequestHandler* PageRequestHandlerFactory::createRequestHandler(c
 	}
 
 	if (url_first_part == "/elopage_webhook_261") {
+		printf("choose elopage\n");
 		return new ElopageWebhook;
 	}
 
diff --git a/src/cpp/ServerConfig.cpp b/src/cpp/ServerConfig.cpp
index 3461e60f1..44b214f88 100644
--- a/src/cpp/ServerConfig.cpp
+++ b/src/cpp/ServerConfig.cpp
@@ -125,7 +125,7 @@ namespace ServerConfig {
 		}
 	}
 
-	void writeToFile(std::istream& datas, std::string& fileName)
+	void writeToFile(std::istream& datas, std::string fileName)
 	{
 		static Poco::Mutex mutex;
 
diff --git a/src/cpp/ServerConfig.h b/src/cpp/ServerConfig.h
index 54e86c4d0..aa14ea24b 100644
--- a/src/cpp/ServerConfig.h
+++ b/src/cpp/ServerConfig.h
@@ -35,7 +35,7 @@ namespace ServerConfig {
 	bool initEMailAccount(const Poco::Util::LayeredConfiguration& cfg);
 	bool initSSLClientContext();
 
-	void writeToFile(std::istream& datas, std::string& fileName);
+	void writeToFile(std::istream& datas, std::string fileName);
 
 	void unload();
 };
\ No newline at end of file
diff --git a/src/cpp/model/Session.cpp b/src/cpp/model/Session.cpp
index 6c0f09364..6f8c0f07f 100644
--- a/src/cpp/model/Session.cpp
+++ b/src/cpp/model/Session.cpp
@@ -297,11 +297,15 @@ bool Session::isPwdValid(const std::string& pwd)
 
 bool Session::loadUser(const std::string& email, const std::string& password)
 {
-	Profiler usedTime;
+	//Profiler usedTime;
+	if (email == "" || password == "") {
+		addError(new Error("Login", "Benutzernamen und Passwort müssen angegeben werden!"));
+		return false;
+	}
 	if (mSessionUser) mSessionUser = nullptr;
 	mSessionUser = new User(email.data());
 	if (!mSessionUser->validatePwd(password)) {
-		addError(new Error("Login", "E-Mail oder Passwort nicht korrekt, bitte versuche es erneut"));
+		addError(new Error("Login", "E-Mail oder Passwort nicht korrekt, bitte versuche es erneut!"));
 		return false;
 	}
 	detectSessionState();