diff --git a/src/cpp/HTTPInterface/AdminGroupsPage.cpp b/src/cpp/HTTPInterface/AdminGroupsPage.cpp
index 5f78d4420..c83a41564 100644
--- a/src/cpp/HTTPInterface/AdminGroupsPage.cpp
+++ b/src/cpp/HTTPInterface/AdminGroupsPage.cpp
@@ -94,24 +94,30 @@ void AdminGroupsPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco:
 	responseStream << "\t\t<div class=\"sidebar1 nav-menu initial\">\n";
 	responseStream << "\t\t\t<div class=\"nav-vertical\">\n";
 	responseStream << "\t\t\t\t<ul>\n";
-	responseStream << "\t\t\t\t\t<li><a href=\"";
+	responseStream << "\t\t\t\t\t";
 #line 22 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header_large.cpsp"
+ if(!user.isNull()) { 	responseStream << "\n";
+	responseStream << "\t\t\t\t\t\t<li><a href=\"";
+#line 23 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header_large.cpsp"
 	responseStream << ( user->getGroupBaseUrl() );
 	responseStream << "/\"><span class=\"link-title\">Startseite</span></a></li>\n";
-	responseStream << "\t\t\t\t\t<li><a href=\"";
-#line 23 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header_large.cpsp"
-	responseStream << ( getBaseUrl() );
-	responseStream << "/groups\"><span class=\"link-title\">Gruppen</span></a></li>\n";
-	responseStream << "\t\t\t\t\t<li><a href=\"";
+	responseStream << "\t\t\t\t\t";
 #line 24 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header_large.cpsp"
-	responseStream << ( getBaseUrl() );
-	responseStream << "/nodes\"><span class=\"link-title\">Node Server</span></a></li>\n";
+ } 	responseStream << "\n";
 	responseStream << "\t\t\t\t\t<li><a href=\"";
 #line 25 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header_large.cpsp"
 	responseStream << ( getBaseUrl() );
-	responseStream << "/hedera_account\"><span class=\"link-title\">Hedera Accounts</span></a></li>\n";
+	responseStream << "/groups\"><span class=\"link-title\">Gruppen</span></a></li>\n";
 	responseStream << "\t\t\t\t\t<li><a href=\"";
 #line 26 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header_large.cpsp"
+	responseStream << ( getBaseUrl() );
+	responseStream << "/nodes\"><span class=\"link-title\">Node Server</span></a></li>\n";
+	responseStream << "\t\t\t\t\t<li><a href=\"";
+#line 27 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header_large.cpsp"
+	responseStream << ( getBaseUrl() );
+	responseStream << "/hedera_account\"><span class=\"link-title\">Hedera Accounts</span></a></li>\n";
+	responseStream << "\t\t\t\t\t<li><a href=\"";
+#line 28 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header_large.cpsp"
 	responseStream << ( getBaseUrl() );
 	responseStream << "/topic\"><span class=\"link-title\">Hedera Topics</span></a></li>\n";
 	responseStream << "\t\t\t\t</ul>\n";
diff --git a/src/cpp/HTTPInterface/AdminHederaAccountPage.cpp b/src/cpp/HTTPInterface/AdminHederaAccountPage.cpp
index 6893254f6..19c843f23 100644
--- a/src/cpp/HTTPInterface/AdminHederaAccountPage.cpp
+++ b/src/cpp/HTTPInterface/AdminHederaAccountPage.cpp
@@ -283,24 +283,30 @@ void AdminHederaAccountPage::handleRequest(Poco::Net::HTTPServerRequest& request
 	responseStream << "\t\t<div class=\"sidebar1 nav-menu initial\">\n";
 	responseStream << "\t\t\t<div class=\"nav-vertical\">\n";
 	responseStream << "\t\t\t\t<ul>\n";
-	responseStream << "\t\t\t\t\t<li><a href=\"";
+	responseStream << "\t\t\t\t\t";
 #line 22 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header_large.cpsp"
+ if(!user.isNull()) { 	responseStream << "\n";
+	responseStream << "\t\t\t\t\t\t<li><a href=\"";
+#line 23 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header_large.cpsp"
 	responseStream << ( user->getGroupBaseUrl() );
 	responseStream << "/\"><span class=\"link-title\">Startseite</span></a></li>\n";
-	responseStream << "\t\t\t\t\t<li><a href=\"";
-#line 23 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header_large.cpsp"
-	responseStream << ( getBaseUrl() );
-	responseStream << "/groups\"><span class=\"link-title\">Gruppen</span></a></li>\n";
-	responseStream << "\t\t\t\t\t<li><a href=\"";
+	responseStream << "\t\t\t\t\t";
 #line 24 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header_large.cpsp"
-	responseStream << ( getBaseUrl() );
-	responseStream << "/nodes\"><span class=\"link-title\">Node Server</span></a></li>\n";
+ } 	responseStream << "\n";
 	responseStream << "\t\t\t\t\t<li><a href=\"";
 #line 25 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header_large.cpsp"
 	responseStream << ( getBaseUrl() );
-	responseStream << "/hedera_account\"><span class=\"link-title\">Hedera Accounts</span></a></li>\n";
+	responseStream << "/groups\"><span class=\"link-title\">Gruppen</span></a></li>\n";
 	responseStream << "\t\t\t\t\t<li><a href=\"";
 #line 26 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header_large.cpsp"
+	responseStream << ( getBaseUrl() );
+	responseStream << "/nodes\"><span class=\"link-title\">Node Server</span></a></li>\n";
+	responseStream << "\t\t\t\t\t<li><a href=\"";
+#line 27 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header_large.cpsp"
+	responseStream << ( getBaseUrl() );
+	responseStream << "/hedera_account\"><span class=\"link-title\">Hedera Accounts</span></a></li>\n";
+	responseStream << "\t\t\t\t\t<li><a href=\"";
+#line 28 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header_large.cpsp"
 	responseStream << ( getBaseUrl() );
 	responseStream << "/topic\"><span class=\"link-title\">Hedera Topics</span></a></li>\n";
 	responseStream << "\t\t\t\t</ul>\n";
diff --git a/src/cpp/HTTPInterface/AdminNodeServerPage.cpp b/src/cpp/HTTPInterface/AdminNodeServerPage.cpp
index 0b8d9d47b..a71aad5bf 100644
--- a/src/cpp/HTTPInterface/AdminNodeServerPage.cpp
+++ b/src/cpp/HTTPInterface/AdminNodeServerPage.cpp
@@ -180,24 +180,30 @@ void AdminNodeServerPage::handleRequest(Poco::Net::HTTPServerRequest& request, P
 	responseStream << "\t\t<div class=\"sidebar1 nav-menu initial\">\n";
 	responseStream << "\t\t\t<div class=\"nav-vertical\">\n";
 	responseStream << "\t\t\t\t<ul>\n";
-	responseStream << "\t\t\t\t\t<li><a href=\"";
+	responseStream << "\t\t\t\t\t";
 #line 22 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header_large.cpsp"
+ if(!user.isNull()) { 	responseStream << "\n";
+	responseStream << "\t\t\t\t\t\t<li><a href=\"";
+#line 23 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header_large.cpsp"
 	responseStream << ( user->getGroupBaseUrl() );
 	responseStream << "/\"><span class=\"link-title\">Startseite</span></a></li>\n";
-	responseStream << "\t\t\t\t\t<li><a href=\"";
-#line 23 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header_large.cpsp"
-	responseStream << ( getBaseUrl() );
-	responseStream << "/groups\"><span class=\"link-title\">Gruppen</span></a></li>\n";
-	responseStream << "\t\t\t\t\t<li><a href=\"";
+	responseStream << "\t\t\t\t\t";
 #line 24 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header_large.cpsp"
-	responseStream << ( getBaseUrl() );
-	responseStream << "/nodes\"><span class=\"link-title\">Node Server</span></a></li>\n";
+ } 	responseStream << "\n";
 	responseStream << "\t\t\t\t\t<li><a href=\"";
 #line 25 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header_large.cpsp"
 	responseStream << ( getBaseUrl() );
-	responseStream << "/hedera_account\"><span class=\"link-title\">Hedera Accounts</span></a></li>\n";
+	responseStream << "/groups\"><span class=\"link-title\">Gruppen</span></a></li>\n";
 	responseStream << "\t\t\t\t\t<li><a href=\"";
 #line 26 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header_large.cpsp"
+	responseStream << ( getBaseUrl() );
+	responseStream << "/nodes\"><span class=\"link-title\">Node Server</span></a></li>\n";
+	responseStream << "\t\t\t\t\t<li><a href=\"";
+#line 27 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header_large.cpsp"
+	responseStream << ( getBaseUrl() );
+	responseStream << "/hedera_account\"><span class=\"link-title\">Hedera Accounts</span></a></li>\n";
+	responseStream << "\t\t\t\t\t<li><a href=\"";
+#line 28 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header_large.cpsp"
 	responseStream << ( getBaseUrl() );
 	responseStream << "/topic\"><span class=\"link-title\">Hedera Topics</span></a></li>\n";
 	responseStream << "\t\t\t\t</ul>\n";
diff --git a/src/cpp/HTTPInterface/AdminTopicPage.cpp b/src/cpp/HTTPInterface/AdminTopicPage.cpp
index ba98879d7..afa2f546e 100644
--- a/src/cpp/HTTPInterface/AdminTopicPage.cpp
+++ b/src/cpp/HTTPInterface/AdminTopicPage.cpp
@@ -224,24 +224,30 @@ void AdminTopicPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::
 	responseStream << "\t\t<div class=\"sidebar1 nav-menu initial\">\n";
 	responseStream << "\t\t\t<div class=\"nav-vertical\">\n";
 	responseStream << "\t\t\t\t<ul>\n";
-	responseStream << "\t\t\t\t\t<li><a href=\"";
+	responseStream << "\t\t\t\t\t";
 #line 22 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header_large.cpsp"
+ if(!user.isNull()) { 	responseStream << "\n";
+	responseStream << "\t\t\t\t\t\t<li><a href=\"";
+#line 23 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header_large.cpsp"
 	responseStream << ( user->getGroupBaseUrl() );
 	responseStream << "/\"><span class=\"link-title\">Startseite</span></a></li>\n";
-	responseStream << "\t\t\t\t\t<li><a href=\"";
-#line 23 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header_large.cpsp"
-	responseStream << ( getBaseUrl() );
-	responseStream << "/groups\"><span class=\"link-title\">Gruppen</span></a></li>\n";
-	responseStream << "\t\t\t\t\t<li><a href=\"";
+	responseStream << "\t\t\t\t\t";
 #line 24 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header_large.cpsp"
-	responseStream << ( getBaseUrl() );
-	responseStream << "/nodes\"><span class=\"link-title\">Node Server</span></a></li>\n";
+ } 	responseStream << "\n";
 	responseStream << "\t\t\t\t\t<li><a href=\"";
 #line 25 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header_large.cpsp"
 	responseStream << ( getBaseUrl() );
-	responseStream << "/hedera_account\"><span class=\"link-title\">Hedera Accounts</span></a></li>\n";
+	responseStream << "/groups\"><span class=\"link-title\">Gruppen</span></a></li>\n";
 	responseStream << "\t\t\t\t\t<li><a href=\"";
 #line 26 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header_large.cpsp"
+	responseStream << ( getBaseUrl() );
+	responseStream << "/nodes\"><span class=\"link-title\">Node Server</span></a></li>\n";
+	responseStream << "\t\t\t\t\t<li><a href=\"";
+#line 27 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header_large.cpsp"
+	responseStream << ( getBaseUrl() );
+	responseStream << "/hedera_account\"><span class=\"link-title\">Hedera Accounts</span></a></li>\n";
+	responseStream << "\t\t\t\t\t<li><a href=\"";
+#line 28 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header_large.cpsp"
 	responseStream << ( getBaseUrl() );
 	responseStream << "/topic\"><span class=\"link-title\">Hedera Topics</span></a></li>\n";
 	responseStream << "\t\t\t\t</ul>\n";
diff --git a/src/cpp/HTTPInterface/TranslatePassphrase.cpp b/src/cpp/HTTPInterface/TranslatePassphrase.cpp
index 61e99c223..3465367e6 100644
--- a/src/cpp/HTTPInterface/TranslatePassphrase.cpp
+++ b/src/cpp/HTTPInterface/TranslatePassphrase.cpp
@@ -5,11 +5,11 @@
 #include "Poco/DeflatingStream.h"
 
 
-#line 7 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\translatePassphrase.cpsp"
+#line 7 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\translatePassphrase.cpsp"
  
 #include "../Crypto/KeyPairEd25519.h"
 #include "../ServerConfig.h"
-#line 1 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\header.cpsp"
+#line 1 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
 
 #include "../ServerConfig.h"
 
@@ -28,7 +28,7 @@ void TranslatePassphrase::handleRequest(Poco::Net::HTTPServerRequest& request, P
 	if (_compressResponse) response.set("Content-Encoding", "gzip");
 
 	Poco::Net::HTMLForm form(request, request.stream());
-#line 11 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\translatePassphrase.cpsp"
+#line 11 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\translatePassphrase.cpsp"
  
 	chooseLanguage(request);
 	// variable needed for flags
@@ -77,7 +77,7 @@ void TranslatePassphrase::handleRequest(Poco::Net::HTTPServerRequest& request, P
 	   
 	   
 	}
-#line 3 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\header.cpsp"
+#line 3 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
 
 	bool withMaterialIcons = false;
 	std::ostream& _responseStream = response.send();
@@ -93,20 +93,20 @@ void TranslatePassphrase::handleRequest(Poco::Net::HTTPServerRequest& request, P
 	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 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\header.cpsp"
+#line 11 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
 	responseStream << ( pageName );
 	responseStream << "</title>\n";
 	responseStream << "<link rel=\"stylesheet\" type=\"text/css\" href=\"";
-#line 12 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\header.cpsp"
+#line 12 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
 	responseStream << ( ServerConfig::g_php_serverPath );
 	responseStream << "css/main.css\">\n";
-#line 13 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\header.cpsp"
+#line 13 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
  if(withMaterialIcons) { 	responseStream << "\n";
 	responseStream << "<link rel=\"stylesheet\" type=\"text/css\" href=\"";
-#line 14 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\header.cpsp"
+#line 14 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
 	responseStream << ( ServerConfig::g_php_serverPath );
 	responseStream << "css/materialdesignicons.min.css\">\n";
-#line 15 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\header.cpsp"
+#line 15 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
  } 	responseStream << "\n";
 	responseStream << "</head>\n";
 	responseStream << "<body>\n";
@@ -114,20 +114,20 @@ void TranslatePassphrase::handleRequest(Poco::Net::HTTPServerRequest& request, P
 	responseStream << "        <div class=\"center-form-single\">\n";
 	responseStream << "            <div class=\"center-form-header\">\n";
 	responseStream << "                <a href=\"";
-#line 21 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\header.cpsp"
+#line 21 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
 	responseStream << ( ServerConfig::g_php_serverPath );
 	responseStream << "\" class=\"center-logo\">\n";
 	responseStream << "                    <picture>\n";
 	responseStream << "                        <source srcset=\"";
-#line 23 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\header.cpsp"
+#line 23 "F:\\Gradido\\gradido_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 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\header.cpsp"
+#line 24 "F:\\Gradido\\gradido_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 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\header.cpsp"
+#line 25 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
 	responseStream << ( ServerConfig::g_php_serverPath );
 	responseStream << "img/logo_schrift.png\" alt=\"logo\" />\n";
 	responseStream << "                    </picture>\n";
@@ -139,20 +139,20 @@ void TranslatePassphrase::handleRequest(Poco::Net::HTTPServerRequest& request, P
 	responseStream << "      <div class=\"row\">\n";
 	responseStream << "        <div class=\"col-12 logo-section\">\n";
 	responseStream << "          <a href=\"";
-#line 5 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\login_header.cpsp"
+#line 5 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login_header.cpsp"
 	responseStream << ( ServerConfig::g_php_serverPath );
 	responseStream << "\" class=\"logo\">\n";
 	responseStream << "            <picture>\n";
 	responseStream << "\t\t\t\t<source srcset=\"";
-#line 7 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\login_header.cpsp"
+#line 7 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login_header.cpsp"
 	responseStream << ( ServerConfig::g_php_serverPath );
 	responseStream << "img/logo_schrift.webp\" type=\"image/webp\">\n";
 	responseStream << "\t\t\t\t<source srcset=\"";
-#line 8 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\login_header.cpsp"
+#line 8 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login_header.cpsp"
 	responseStream << ( ServerConfig::g_php_serverPath );
 	responseStream << "img/logo_schrift.png\" type=\"image/png\"> \n";
 	responseStream << "\t\t\t\t<img src=\"";
-#line 9 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\login_header.cpsp"
+#line 9 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login_header.cpsp"
 	responseStream << ( ServerConfig::g_php_serverPath );
 	responseStream << "img/logo_schrift.png\" alt=\"logo\" />\n";
 	responseStream << "\t\t\t</picture>\n";
@@ -164,7 +164,7 @@ void TranslatePassphrase::handleRequest(Poco::Net::HTTPServerRequest& request, P
 	responseStream << "          <div class=\"grid\">\n";
 	responseStream << "            <div class=\"center-ul-container\">\n";
 	responseStream << "              ";
-#line 18 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\login_header.cpsp"
+#line 18 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login_header.cpsp"
 	responseStream << ( getErrorsHtml() );
 	responseStream << "\n";
 	responseStream << "            </div>\n";
@@ -174,22 +174,22 @@ void TranslatePassphrase::handleRequest(Poco::Net::HTTPServerRequest& request, P
 	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 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\flags.cpsp"
+#line 3 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\flags.cpsp"
  if(lang != LANG_EN) { 	responseStream << "class=\"flag-btn\"";
-#line 3 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\flags.cpsp"
+#line 3 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\flags.cpsp"
  }
 	else { 	responseStream << "class=\"flag-btn\" disabled";
-#line 4 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\flags.cpsp"
+#line 4 "F:\\Gradido\\gradido_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 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\flags.cpsp"
+#line 7 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\flags.cpsp"
  if(lang != LANG_DE) { 	responseStream << "class=\"flag-btn\"";
-#line 7 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\flags.cpsp"
+#line 7 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\flags.cpsp"
  }
 	else { 	responseStream << "class=\"flag-btn\" disabled";
-#line 8 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\flags.cpsp"
+#line 8 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\flags.cpsp"
  } 	responseStream << ">\n";
 	responseStream << "\t  <span class=\"flag flag-germany\"></span>\n";
 	responseStream << "\t</button>\n";
@@ -199,7 +199,7 @@ void TranslatePassphrase::handleRequest(Poco::Net::HTTPServerRequest& request, P
 	responseStream << "\n";
 	responseStream << "<div class=\"row mb-3\" style=\"margin-top:70px;\">\n";
 	responseStream << "\t<h2 class=\"mx-auto\">";
-#line 61 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\translatePassphrase.cpsp"
+#line 61 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\translatePassphrase.cpsp"
 	responseStream << ( gettext("Passphrase umwandeln") );
 	responseStream << "</h2>\n";
 	responseStream << "</div>\n";
@@ -210,57 +210,57 @@ void TranslatePassphrase::handleRequest(Poco::Net::HTTPServerRequest& request, P
 	responseStream << "\t  <div class=\"col-md-12 col-lg-12 \">\n";
 	responseStream << "\t\t<div class=\"alert alert-orange\">\n";
 	responseStream << "\t\t  <h5 class=\"alert-heading\">";
-#line 69 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\translatePassphrase.cpsp"
+#line 69 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\translatePassphrase.cpsp"
 	responseStream << ( gettext("Was zu tun ist:") );
 	responseStream << "</h5>\n";
 	responseStream << "\t\t  <p>";
-#line 70 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\translatePassphrase.cpsp"
+#line 70 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\translatePassphrase.cpsp"
 	responseStream << ( gettext("Kopiere/schreibe deine Passphrase in die Textbox und du bekommst sie in die jeweils andere Sprache umgewandelt.") );
 	responseStream << "</p>\n";
 	responseStream << "\t\t  <p>";
-#line 71 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\translatePassphrase.cpsp"
+#line 71 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\translatePassphrase.cpsp"
 	responseStream << ( gettext("Du kannst mit beiden Varianten dein Konto wiederherstellen oder dein Passwort ändern.") );
 	responseStream << "</p>\n";
 	responseStream << "\t\t</div>\n";
 	responseStream << "\t  </div>\n";
 	responseStream << "\t  <div class=\"col-lg-12 col-md-12 mb-5\">\n";
 	responseStream << "\t\t<form action=\"";
-#line 75 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\translatePassphrase.cpsp"
+#line 75 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\translatePassphrase.cpsp"
 	responseStream << ( uri_start );
 	responseStream << "/transform_passphrase\">\n";
 	responseStream << "\t\t  <div class=\"form-group row-showcase_row_area\">\n";
 	responseStream << "\t\t\t<textarea name=\"inputPassphrase\" cols=\"20\" rows=\"10\" id=\"inputPassphrase\" class=\"form-control\" placeholder=\"";
-#line 77 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\translatePassphrase.cpsp"
+#line 77 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\translatePassphrase.cpsp"
 	responseStream << ( gettext("deine Passphrase") );
 	responseStream << "\">";
-#line 77 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\translatePassphrase.cpsp"
+#line 77 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\translatePassphrase.cpsp"
 	responseStream << ( inputPassphrase );
 	responseStream << "</textarea>\n";
 	responseStream << "\t\t  </div>\n";
 	responseStream << "\t\t  <input name=\"btnTransform\" type=\"submit\" value=\"Umwandeln\" class=\"btn btn btn-orange\">\n";
 	responseStream << "\t\t  ";
-#line 80 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\translatePassphrase.cpsp"
+#line 80 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\translatePassphrase.cpsp"
  if(model::table::ROLE_ADMIN == role) { 	responseStream << "\n";
 	responseStream << "\t\t\t<input name=\"btnGenerate\" type=\"submit\" value=\"Neue generieren\" class=\"btn btn-secondary\">\n";
 	responseStream << "\t\t  ";
-#line 82 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\translatePassphrase.cpsp"
+#line 82 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\translatePassphrase.cpsp"
  } 	responseStream << "\n";
 	responseStream << "\t\t</form>\n";
 	responseStream << "\t  </div>\n";
 	responseStream << "\t  ";
-#line 85 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\translatePassphrase.cpsp"
+#line 85 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\translatePassphrase.cpsp"
  if(passphrase != "") { 	responseStream << "\n";
 	responseStream << "\t\t<div class=\"col-lg-12 col-md-12\">\n";
 	responseStream << "\t\t\t<div class=\"alert alert-success\">\n";
 	responseStream << "\t\t\t\t<h5 class=\"alert-heading\">Umgewandelte Passphrase: </h5>\n";
 	responseStream << "\t\t\t\t<p>";
-#line 89 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\translatePassphrase.cpsp"
+#line 89 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\translatePassphrase.cpsp"
 	responseStream << ( passphrase );
 	responseStream << "</p>\n";
 	responseStream << "\t\t\t</div>\n";
 	responseStream << "\t\t</div>\n";
 	responseStream << "\t  ";
-#line 92 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\translatePassphrase.cpsp"
+#line 92 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\translatePassphrase.cpsp"
  } 	responseStream << "\n";
 	responseStream << "\t  </div>\n";
 	responseStream << "\t</div>\n";
@@ -289,7 +289,7 @@ void TranslatePassphrase::handleRequest(Poco::Net::HTTPServerRequest& request, P
 	responseStream << "    </div>\n";
 	responseStream << "    <div class=\"grd-time-used dev-info\">\n";
 	responseStream << "        ";
-#line 23 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\footer_ripple.cpsp"
+#line 23 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\footer_ripple.cpsp"
 	responseStream << ( mTimeProfiler.string() );
 	responseStream << "\n";
 	responseStream << "    </div>\n";
@@ -305,7 +305,7 @@ void TranslatePassphrase::handleRequest(Poco::Net::HTTPServerRequest& request, P
 	responseStream << "    <!-- build:js -->\n";
 	responseStream << "    <!--<script src=\"../../../assets/js/template.js\"></script>-->\n";
 	responseStream << "    <script src=\"";
-#line 36 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\footer_ripple.cpsp"
+#line 36 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\footer_ripple.cpsp"
 	responseStream << ( ServerConfig::g_php_serverPath );
 	responseStream << "/js/basic.js\"></script>\n";
 	responseStream << "    <!--<script src=\"../../../assets/js/dashboard.js\"></script>-->\n";
diff --git a/src/cpp/HTTPInterface/UserUpdateGroupPage.cpp b/src/cpp/HTTPInterface/UserUpdateGroupPage.cpp
index 78b1e35cf..9517ea185 100644
--- a/src/cpp/HTTPInterface/UserUpdateGroupPage.cpp
+++ b/src/cpp/HTTPInterface/UserUpdateGroupPage.cpp
@@ -5,7 +5,7 @@
 #include "Poco/DeflatingStream.h"
 
 
-#line 6 "F:\\gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
+#line 6 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
 
 
 #include "../controller/Group.h"
@@ -20,7 +20,7 @@ enum PageState {
 	PAGE_STATE_NO_GROUPS
 };
 
-#line 1 "F:\\gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
+#line 1 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
 
 #include "../ServerConfig.h"
 
@@ -39,7 +39,7 @@ void UserUpdateGroupPage::handleRequest(Poco::Net::HTTPServerRequest& request, P
 	if (_compressResponse) response.set("Content-Encoding", "gzip");
 
 	Poco::Net::HTMLForm form(request, request.stream());
-#line 21 "F:\\gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
+#line 21 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
 
 	const char* pageName = gettext("Gruppe wählen");
 	auto user = mSession->getNewUser();
@@ -122,7 +122,7 @@ void UserUpdateGroupPage::handleRequest(Poco::Net::HTTPServerRequest& request, P
 	
 	
 	
-#line 3 "F:\\gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
+#line 3 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
 
 	bool withMaterialIcons = false;
 	std::ostream& _responseStream = response.send();
@@ -137,20 +137,20 @@ void UserUpdateGroupPage::handleRequest(Poco::Net::HTTPServerRequest& request, P
 	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_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_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_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_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_login_server\\src\\cpsp\\header.cpsp"
  } 	responseStream << "\n";
 	responseStream << "</head>\n";
 	responseStream << "<body>\n";
@@ -158,20 +158,20 @@ void UserUpdateGroupPage::handleRequest(Poco::Net::HTTPServerRequest& request, P
 	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_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_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_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_login_server\\src\\cpsp\\header.cpsp"
 	responseStream << ( ServerConfig::g_php_serverPath );
 	responseStream << "img/logo_schrift.png\" alt=\"logo\" />\n";
 	responseStream << "                    </picture>\n";
@@ -179,100 +179,100 @@ void UserUpdateGroupPage::handleRequest(Poco::Net::HTTPServerRequest& request, P
 	responseStream << "            </div>";
 	// end include header.cpsp
 	responseStream << "\n";
-#line 104 "F:\\gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
+#line 104 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
 	responseStream << ( getErrorsHtml() );
 	responseStream << "\n";
 	responseStream << "<div class=\"content-list\">\n";
 	responseStream << "\t";
-#line 106 "F:\\gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
+#line 106 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
  if(PAGE_STATE_OVERVIEW == state ) { 	responseStream << "\n";
 	responseStream << "    <div class=\"content-list-title\">\n";
 	responseStream << "        <h1>";
-#line 108 "F:\\gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
+#line 108 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
 	responseStream << ( gettext("Gruppe wählen") );
 	responseStream << "</h1>\n";
 	responseStream << "    </div>\n";
 	responseStream << "\t<p>";
-#line 110 "F:\\gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
+#line 110 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
 	responseStream << ( gettext("Bitte wähle die Gruppe/Gemeinschaft aus, zu der du gehörst.") );
 	responseStream << "</p>\n";
 	responseStream << "\t<p>";
-#line 111 "F:\\gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
+#line 111 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
 	responseStream << ( gettext("Du bekommst eine Bestätigungsmail, nachdem dein Beitritt bestätigt wurde.") );
 	responseStream << "</p>\n";
 	responseStream << "\t<form method=\"POST\">\n";
 	responseStream << "\t\t<div class=\"content-list-table\">\n";
 	responseStream << "\t\t\t<div class=\"row\">\n";
 	responseStream << "\t\t\t\t<div class=\"cell header-cell c1\">";
-#line 115 "F:\\gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
+#line 115 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
 	responseStream << ( gettext("Auswahl") );
 	responseStream << "</div>\n";
 	responseStream << "\t\t\t\t<div class=\"cell header-cell c2\">Name</div>\n";
 	responseStream << "\t\t\t\t<div class=\"cell header-cell c2\">Alias</div>\n";
 	responseStream << "\t\t\t\t<div class=\"cell header-cell c4\">Url</div>\n";
 	responseStream << "\t\t\t\t<div class=\"cell header-cell c5\">";
-#line 119 "F:\\gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
+#line 119 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
 	responseStream << ( gettext("Description") );
 	responseStream << "</div>\n";
 	responseStream << "\t\t\t</div>\n";
 	responseStream << "\t\t\t";
-#line 121 "F:\\gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
+#line 121 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
  for(auto it = groups.begin(); it != groups.end(); it++) {
 					auto group_model = (*it)->getModel(); 	responseStream << "\n";
 	responseStream << "\t\t\t\t<div class=\"row\">\n";
 	responseStream << "\t\t\t\t\t<div class=\"cell c1\"><input type=\"radio\" class=\"form-control\" name=\"group_id\" value=\"";
-#line 124 "F:\\gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
+#line 124 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
 	responseStream << ( group_model->getID());
 	responseStream << "\" /></div>\n";
 	responseStream << "\t\t\t\t\t<div class=\"cell c2\">";
-#line 125 "F:\\gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
+#line 125 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
 	responseStream << ( group_model->getName() );
 	responseStream << "</div>\n";
 	responseStream << "\t\t\t\t\t<div class=\"cell c2\">";
-#line 126 "F:\\gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
+#line 126 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
 	responseStream << ( group_model->getAlias() );
 	responseStream << "</div>\n";
 	responseStream << "\t\t\t\t\t<div class=\"cell c4\">";
-#line 127 "F:\\gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
+#line 127 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
 	responseStream << ( group_model->getUrl() );
 	responseStream << "</div>\n";
 	responseStream << "\t\t\t\t\t<div class=\"cell c5\">";
-#line 128 "F:\\gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
+#line 128 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
 	responseStream << ( group_model->getDescription());
 	responseStream << "</div>\n";
 	responseStream << "\t\t\t\t</div>\n";
 	responseStream << "\t\t\t";
-#line 130 "F:\\gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
+#line 130 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
  } 	responseStream << "\n";
 	responseStream << "\t\t\t<input class=\"grd-form-bn grd-form-bn-succeed grd_clickable\" type=\"submit\" name=\"submit\" value=\"";
-#line 131 "F:\\gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
+#line 131 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
 	responseStream << ( gettext("Beitrittsanfrage senden") );
 	responseStream << "\"/>\n";
 	responseStream << "\t\t</div>\n";
 	responseStream << "\t</form>\n";
 	responseStream << "\t";
-#line 134 "F:\\gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
+#line 134 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
  } else if(PAGE_STATE_REQUEST_IS_RUNNING == state) { 	responseStream << "\n";
 	responseStream << "\t\t<p>";
-#line 135 "F:\\gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
+#line 135 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
 	responseStream << ( gettext("Deine Beitrittsanfrage wird bearbeitet, du bekommst eine E-Mail wenn sie bestätigt oder abgelehnt wurde.") );
 	responseStream << "</p>\n";
 	responseStream << "\t\t<p><a href=\"";
-#line 136 "F:\\gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
+#line 136 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
 	responseStream << ( ServerConfig::g_serverPath );
 	responseStream << "/logout\">";
-#line 136 "F:\\gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
+#line 136 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
 	responseStream << ( gettext("Abmelden") );
 	responseStream << "</a></p>\n";
 	responseStream << "\t";
-#line 137 "F:\\gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
+#line 137 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
  } else if(PAGE_STATE_NO_GROUPS == state) { 	responseStream << "\n";
 	responseStream << "\t\t<p>";
-#line 138 "F:\\gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
+#line 138 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
 	responseStream << ( gettext("Noch keine Gruppen vorhanden, bitte warte bis der Admin welche hinzugef&uuml;gt hat.") );
 	responseStream << "\n";
 	responseStream << "\t";
-#line 139 "F:\\gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
+#line 139 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
  } 	responseStream << "\n";
 	responseStream << "</div>\n";
 	// begin include footer.cpsp
@@ -282,14 +282,14 @@ void UserUpdateGroupPage::handleRequest(Poco::Net::HTTPServerRequest& request, P
 	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_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_login_server\\src\\cpsp\\footer.cpsp"
 	responseStream << ( ServerConfig::g_versionString );
 	responseStream << "</p>\n";
 	responseStream << "        </div>\n";
diff --git a/src/cpp/model/gradido/GroupMemberUpdate.cpp b/src/cpp/model/gradido/GroupMemberUpdate.cpp
index 17776c56d..1a665445c 100644
--- a/src/cpp/model/gradido/GroupMemberUpdate.cpp
+++ b/src/cpp/model/gradido/GroupMemberUpdate.cpp
@@ -106,6 +106,10 @@ namespace model {
 		{
 			static const char* function_name = "GroupMemberUpdate::transactionAccepted";
 			auto sm = SessionManager::getInstance();
+			if (user.isNull()) {
+				printf("[%s] user is zero, was transaction created from test call, without saving user into db?\n", function_name);
+				return;
+			}
 
 			auto target_group = mProtoMemberUpdate.target_group();
 			
diff --git a/src/cpp/model/table/ModelBase.cpp b/src/cpp/model/table/ModelBase.cpp
index 376de1065..d8c4803df 100644
--- a/src/cpp/model/table/ModelBase.cpp
+++ b/src/cpp/model/table/ModelBase.cpp
@@ -65,7 +65,7 @@ namespace model {
 							addError(new ParamError(getTableName(), "mysql error by select id", ex.displayText().data()));
 							addError(new ParamError(getTableName(), "data set: ", toString().data()));
 						}
-						select.reset(session);
+						session = cm->getConnection(CONNECTION_MYSQL_LOGIN_SERVER);
 						select = _loadIdFromDB(session);
 						//Poco::Data::Statement select = _loadIdFromDB(session);
 						select.execute();
diff --git a/src/cpp/model/table/PendingTask.cpp b/src/cpp/model/table/PendingTask.cpp
index 6051d6945..5bee7339a 100644
--- a/src/cpp/model/table/PendingTask.cpp
+++ b/src/cpp/model/table/PendingTask.cpp
@@ -66,7 +66,10 @@ namespace model
 		std::string PendingTask::toString()
 		{
 			std::stringstream ss;
-			std::shared_lock<std::shared_mutex> _lock(mSharedMutex);
+			ss << "id: " << mID << std::endl;
+			ss << "user_id: " << mUserId << std::endl;
+			ss << "created: " << Poco::DateTimeFormatter::format(mCreated, "%f.%m.%Y %H:%M:%S") << std::endl;
+			ss << "task type: " << typeToString((TaskType)mTaskTypeId);
 			return ss.str();
 		}
 
diff --git a/src/cpp/tasks/CPUShedulerThread.cpp b/src/cpp/tasks/CPUShedulerThread.cpp
index e60a9a004..9529b536f 100644
--- a/src/cpp/tasks/CPUShedulerThread.cpp
+++ b/src/cpp/tasks/CPUShedulerThread.cpp
@@ -41,15 +41,21 @@ namespace UniLib {
 				std::string name = mWaitingTask->getName();
 				//l->addTaskLogEntry((HASH)mWaitingTask.getResourcePtrHolder(), mWaitingTask->getResourceType(), mName.data(), name);
 #endif 
-				int returnValue = mWaitingTask->run();
-				if (!returnValue) {
-					mWaitingTask->setTaskFinished();
-				}
+				try {
+					int returnValue = mWaitingTask->run();
+					if (!returnValue) {
+						mWaitingTask->setTaskFinished();
+					}
 #ifdef _UNI_LIB_DEBUG
-				//l->removeTaskLogEntry((HASH)mWaitingTask.getResourcePtrHolder());
-				mSpeedLog.information("%s used on thread: %s by Task: %s of: %s (returned: %d)",
-					counter.string(), mName, std::string(mWaitingTask->getResourceType()), name, returnValue);
+					//l->removeTaskLogEntry((HASH)mWaitingTask.getResourcePtrHolder());
+					mSpeedLog.information("%s used on thread: %s by Task: %s of: %s (returned: %d)",
+						counter.string(), mName, std::string(mWaitingTask->getResourceType()), name, returnValue);
 #endif
+				}
+				catch (Poco::NullPointerException& ex) {
+					printf("[CPUShedulerThread::ThreadFunction] Null Pointer Exception for Task type: %s\n", mWaitingTask->getResourceType());			
+				}
+
 				mWaitingTask = mParent->getNextUndoneTask(this);
 			}
 			return 0;
diff --git a/src/cpp/tasks/Thread.cpp b/src/cpp/tasks/Thread.cpp
index 0c095aeb9..ada5abeda 100644
--- a/src/cpp/tasks/Thread.cpp
+++ b/src/cpp/tasks/Thread.cpp
@@ -80,6 +80,11 @@ namespace UniLib {
 							return;
 						}
 					}
+					catch (Poco::NullPointerException& e) {
+						threadUnlock();
+						printf("[Thread::%s] NULL pointer exception\n", __FUNCTION__);
+						return;
+					}
 					catch (Poco::Exception& e) {
 						//unlock mutex and exit
 						threadUnlock();
diff --git a/src/cpsp/header_large.cpsp b/src/cpsp/header_large.cpsp
index 37f888e22..0704867d4 100644
--- a/src/cpsp/header_large.cpsp
+++ b/src/cpsp/header_large.cpsp
@@ -19,7 +19,9 @@
 		<div class="sidebar1 nav-menu initial">
 			<div class="nav-vertical">
 				<ul>
-					<li><a href="<%= user->getGroupBaseUrl() %>/"><span class="link-title">Startseite</span></a></li>
+					<% if(!user.isNull()) { %>
+						<li><a href="<%= user->getGroupBaseUrl() %>/"><span class="link-title">Startseite</span></a></li>
+					<% } %>
 					<li><a href="<%= getBaseUrl() %>/groups"><span class="link-title">Gruppen</span></a></li>
 					<li><a href="<%= getBaseUrl() %>/nodes"><span class="link-title">Node Server</span></a></li>
 					<li><a href="<%= getBaseUrl() %>/hedera_account"><span class="link-title">Hedera Accounts</span></a></li>