diff --git a/src/cpp/HTTPInterface/UserUpdateGroupPage.cpp b/src/cpp/HTTPInterface/UserUpdateGroupPage.cpp
index 6f1fde683..efebbed41 100644
--- a/src/cpp/HTTPInterface/UserUpdateGroupPage.cpp
+++ b/src/cpp/HTTPInterface/UserUpdateGroupPage.cpp
@@ -87,18 +87,33 @@ void UserUpdateGroupPage::handleRequest(Poco::Net::HTTPServerRequest& request, P
 			state = PAGE_STATE_NO_GROUPS;
 		
 		} else {
+			auto referer = request.find("Referer");
+			std::string refererString;
+			if (referer != request.end()) {
+				refererString = referer->second;
+			}
+			
+			
+			
 			pt->lock("userUpdateGroup Page");
-			if(pt->hasPendingTask(user, model::table::TASK_TYPE_GROUP_ADD_MEMBER)) {
+			auto has_pending_group_add_member_task = pt->hasPendingTask(user, model::table::TASK_TYPE_GROUP_ADD_MEMBER);
+			auto referer_was_checkTransaction = refererString.find("checkTransactions") != std::string::npos;
+			if(has_pending_group_add_member_task) {
 				state = PAGE_STATE_REQUEST_IS_RUNNING;
 				std::vector<Poco::AutoPtr<controller::PendingTask>> tasks = pt->getPendingTasks(user, model::table::TASK_TYPE_GROUP_ADD_MEMBER);
 				// should be only one
 				Poco::AutoPtr<model::gradido::Transaction> transaction = tasks[0].cast<model::gradido::Transaction>();
 				if(transaction->getSignCount() == 0) {
 					pt->unlock();
-					response.redirect(user->getGroupBaseUrl() + "/checkTransactions");
+					response.redirect(ServerConfig::g_serverPath + "/checkTransactions");
 					return;
 				}
+			} else if(referer_was_checkTransaction && user->getModel()->getGroupId()) {
+				pt->unlock();
+				response.redirect(user->getGroupBaseUrl());
+				return;
 			}
+			
 			pt->unlock();
 		}
 	}
@@ -163,100 +178,100 @@ void UserUpdateGroupPage::handleRequest(Poco::Net::HTTPServerRequest& request, P
 	responseStream << "            </div>";
 	// end include header.cpsp
 	responseStream << "\n";
-#line 88 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
+#line 103 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
 	responseStream << ( getErrorsHtml() );
 	responseStream << "\n";
 	responseStream << "<div class=\"content-list\">\n";
 	responseStream << "\t";
-#line 90 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
+#line 105 "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 92 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
+#line 107 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
 	responseStream << ( gettext("Gruppe wählen") );
 	responseStream << "</h1>\n";
 	responseStream << "    </div>\n";
 	responseStream << "\t<p>";
-#line 94 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
+#line 109 "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 95 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
+#line 110 "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 99 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
+#line 114 "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 c3\">Url</div>\n";
 	responseStream << "\t\t\t\t<div class=\"cell header-cell c5\">";
-#line 103 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
+#line 118 "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 105 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
+#line 120 "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 108 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
+#line 123 "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 109 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
+#line 124 "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 110 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
+#line 125 "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 c3\">";
-#line 111 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
+#line 126 "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 112 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
+#line 127 "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 114 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
+#line 129 "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 115 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
+#line 130 "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 118 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
+#line 133 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
  } else if(PAGE_STATE_REQUEST_IS_RUNNING == state) { 	responseStream << "\n";
 	responseStream << "\t\t<p>";
-#line 119 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
+#line 134 "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 120 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
+#line 135 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
 	responseStream << ( ServerConfig::g_serverPath );
 	responseStream << "/logout\">";
-#line 120 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
+#line 135 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
 	responseStream << ( gettext("Abmelden") );
 	responseStream << "</a></p>\n";
 	responseStream << "\t";
-#line 121 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
+#line 136 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
  } else if(PAGE_STATE_NO_GROUPS == state) { 	responseStream << "\n";
 	responseStream << "\t\t<p>";
-#line 122 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
+#line 137 "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 123 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
+#line 138 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
  } 	responseStream << "\n";
 	responseStream << "</div>\n";
 	// begin include footer.cpsp
diff --git a/src/cpsp/userUpdateGroup.cpsp b/src/cpsp/userUpdateGroup.cpsp
index 7e210eb4b..2c204fdc6 100644
--- a/src/cpsp/userUpdateGroup.cpsp
+++ b/src/cpsp/userUpdateGroup.cpsp
@@ -65,18 +65,33 @@ enum PageState {
 			state = PAGE_STATE_NO_GROUPS;
 		
 		} else {
+			auto referer = request.find("Referer");
+			std::string refererString;
+			if (referer != request.end()) {
+				refererString = referer->second;
+			}
+			
+			
+			
 			pt->lock("userUpdateGroup Page");
-			if(pt->hasPendingTask(user, model::table::TASK_TYPE_GROUP_ADD_MEMBER)) {
+			auto has_pending_group_add_member_task = pt->hasPendingTask(user, model::table::TASK_TYPE_GROUP_ADD_MEMBER);
+			auto referer_was_checkTransaction = refererString.find("checkTransactions") != std::string::npos;
+			if(has_pending_group_add_member_task) {
 				state = PAGE_STATE_REQUEST_IS_RUNNING;
 				std::vector<Poco::AutoPtr<controller::PendingTask>> tasks = pt->getPendingTasks(user, model::table::TASK_TYPE_GROUP_ADD_MEMBER);
 				// should be only one
 				Poco::AutoPtr<model::gradido::Transaction> transaction = tasks[0].cast<model::gradido::Transaction>();
 				if(transaction->getSignCount() == 0) {
 					pt->unlock();
-					response.redirect(user->getGroupBaseUrl() + "/checkTransactions");
+					response.redirect(ServerConfig::g_serverPath + "/checkTransactions");
 					return;
 				}
+			} else if(referer_was_checkTransaction && user->getModel()->getGroupId()) {
+				pt->unlock();
+				response.redirect(user->getGroupBaseUrl());
+				return;
 			}
+			
 			pt->unlock();
 		}
 	}