diff --git a/libresapi/src/api/RsControlModule.cpp b/libresapi/src/api/RsControlModule.cpp
index 1d0f32fe0..31d8c3518 100644
--- a/libresapi/src/api/RsControlModule.cpp
+++ b/libresapi/src/api/RsControlModule.cpp
@@ -31,7 +31,7 @@ RsControlModule::RsControlModule(int argc, char **argv, StateTokenServer* sts, A
     if(full_control)
         start();
     else
-        mRunState = RUNNING_OK;
+        mRunState = RUNNING_OK_NO_FULL_CONTROL;
 
     addResourceHandler("runstate", this, &RsControlModule::handleRunState);
     addResourceHandler("identities", this, &RsControlModule::handleIdentities);
@@ -209,6 +209,9 @@ void RsControlModule::handleRunState(Request &req, Response &resp)
     case RUNNING_OK:
         state = "running_ok";
         break;
+    case RUNNING_OK_NO_FULL_CONTROL:
+        state = "running_ok_no_full_control";
+        break;
     default:
         state = "error_should_not_happen_this_is_a_bug";
     }
diff --git a/libresapi/src/api/RsControlModule.h b/libresapi/src/api/RsControlModule.h
index 648c8984b..b36144957 100644
--- a/libresapi/src/api/RsControlModule.h
+++ b/libresapi/src/api/RsControlModule.h
@@ -41,7 +41,7 @@ protected:
     virtual void run();
 
 private:
-    enum RunState { WAITING_INIT, FATAL_ERROR, WAITING_ACCOUNT_SELECT, WAITING_STARTUP, RUNNING_OK};
+    enum RunState { WAITING_INIT, FATAL_ERROR, WAITING_ACCOUNT_SELECT, WAITING_STARTUP, RUNNING_OK, RUNNING_OK_NO_FULL_CONTROL};
     void handleRunState(Request& req, Response& resp);
     void handleIdentities(Request& req, Response& resp);
     void handleLocations(Request& req, Response& resp);
diff --git a/libresapi/src/webui/gui.jsx b/libresapi/src/webui/gui.jsx
index 5726d654f..11210478f 100644
--- a/libresapi/src/webui/gui.jsx
+++ b/libresapi/src/webui/gui.jsx
@@ -612,9 +612,13 @@ var Menu = React.createClass({
 					<div className="btn2" onClick={function(){outer.emit("change_url", {url: "main"});}}>
 						Start
 					</div>
-					<div className="btn2" onClick={function(){outer.emit("change_url", {url: "login"});}}>
-						Login
-					</div>
+					{function(){
+						if(outer.props.fullcontrol)
+							return (<div className="btn2" onClick={function(){outer.emit("change_url", {url: "login"});}}>
+								Login
+							</div>);
+						else return <div></div>;
+					}()}
 					<div className="btn2" onClick={function(){outer.emit("change_url", {url: "friends"});}}>
 						Friends
 					</div>
@@ -710,7 +714,7 @@ var MainWidget = React.createClass({
 		{
 			mainpage = <LoginWidget/>;
 		}
-		if(this.state.data.runstate === "running_ok")
+		if(this.state.data.runstate === "running_ok" || this.state.data.runstate ==="running_ok_no_full_control")
 		{
 		if(this.state.page === "main")
 		{
@@ -744,7 +748,7 @@ var MainWidget = React.createClass({
 		}
 		if(this.state.page === "menu")
 		{
-			mainpage = <Menu/>;
+			mainpage = <Menu fullcontrol = {this.state.data.runstate === "running_ok"}/>;
 		}
 		if(this.state.page === "testwidget")
 		{