diff --git a/js/tm.js b/js/tm.js
index db02b6c..7ccde2f 100644
--- a/js/tm.js
+++ b/js/tm.js
@@ -7,7 +7,7 @@ var breaktime = 0;
 
 function loadTMIcon(){
     var iconBaseUrl = OC.generateUrl('/svg/core/actions/user-admin');
-    icon = $('<a href="#" class="header-menu" style="margin-right: 20px; margin-top: 2px;"><img src="'+iconBaseUrl+'"></a>');
+    icon = $('<a id="timeicon" href="#" class="header-menu" style="margin-right: 20px; margin-top: 2px; display: none;"><img src="'+iconBaseUrl+'"></a>');
     $('.header-right').prepend(icon);
 }
 
@@ -61,11 +61,19 @@ function addTMDiv(){
     }).success(function (response) {
         $("#td_content").show();
         $("#loader").hide();
-        
         responsedata = JSON.parse(response);
+        console.log(responsedata['usetime']);
         $("#actualTime").html(responsedata['actualtime']);
         // No workday found
-        if(responsedata['workdaydata_workday'] == 0 || response == false){
+        // User does not use time
+        if(responsedata['usetime'] == false ){
+            $("#timeicon").hide();
+        }
+        else{
+            $("#timeicon").show();
+        }
+        
+        if(responsedata['workdaydata_workday'] == 0){
             starttime_view = false;
             startbreaktime_view = false;
             isbreak = false;
diff --git a/lib/Controller/PageController.php b/lib/Controller/PageController.php
index 2a7a3fc..9972c83 100644
--- a/lib/Controller/PageController.php
+++ b/lib/Controller/PageController.php
@@ -41,8 +41,22 @@ class PageController extends Controller {
 		return $response;
 	}
 
+	function myUrlEncode($string) {
+		$entities = array('%21', '%2A', '%27', '%28', '%29', '%3B', '%3A', '%40', '%26', '%3D', '%2B', '%24', '%2C', '%2F', '%3F', '%25', '%23', '%5B', '%5D');
+		$replacements = array('!', '*', "'", "(", ")", ";", ":", "@", "&", "=", "+", "$", ",", "/", "?", "%", "#", "[", "]");
+		return str_replace($entities, $replacements, urlencode($string));
+	}
+
+	function removeMail(string $uid){
+		$uid = str_replace("@","REPLACEDATAELEMENTVER0000000001",$uid);
+		$uid = str_replace(".","POINTPOINTPOINTPOINTPOINTPOINT",$uid);
+
+		return $uid;
+	}
+
 	/**
 	 * @NoCSRFRequired
+	 * @NoAdminRequired
 	 * 
 	 * Startet einen Arbeitstag
 	 */
@@ -59,13 +73,14 @@ class PageController extends Controller {
         ];
         $context = stream_context_create($opts);
 
-        $file = file_get_contents($this->nclink.'/api/tm/startday/'.$this->userSession->getUser()->getUId().'/87zuhjk87GHJ546tzgvhas76aaskbdhr45edfVHAKia87s6gbAVGFGSR3451627gBHAKJBN', false, $context);
+        $file = file_get_contents($this->myUrlEncode($this->nclink.'/api/tm/startday/'.$this->removeMail($this->userSession->getUser()->getUId()).'/87zuhjk87GHJ546tzgvhas76aaskbdhr45edfVHAKia87s6gbAVGFGSR3451627gBHAKJBN'), false, $context);
 		#$response = new TemplateResponse('da_agency', 'realtimeclock', ['userId' => $this->userSession->getUser()->getUID(), 'data' => "none"]);
 		return new DataResponse($file);
 	}
 
 	/**
 	 * @NoCSRFRequired
+	 * @NoAdminRequired
 	 * 
 	 * Beendet einen Arbeitstag
 	 */
@@ -82,13 +97,14 @@ class PageController extends Controller {
         ];
         $context = stream_context_create($opts);
 
-        $file = file_get_contents($this->nclink.'/api/tm/endday/'.$this->userSession->getUser()->getUId().'/87zuhjk87GHJ546tzgvhas76aaskbdhr45edfVHAKia87s6gbAVGFGSR3451627gBHAKJBN', false, $context);
+        $file = file_get_contents($this->myUrlEncode($this->nclink.'/api/tm/endday/'.$this->removeMail($this->userSession->getUser()->getUId()).'/87zuhjk87GHJ546tzgvhas76aaskbdhr45edfVHAKia87s6gbAVGFGSR3451627gBHAKJBN'), false, $context);
 		#$response = new TemplateResponse('da_agency', 'realtimeclock', ['userId' => $this->userSession->getUser()->getUID(), 'data' => "none"]);
 		return new DataResponse($file);
 	}
 
 	/**
 	 * @NoCSRFRequired
+	 * @NoAdminRequired
 	 * 
 	 * Beendet einen Arbeitstag
 	 */
@@ -105,13 +121,14 @@ class PageController extends Controller {
         ];
         $context = stream_context_create($opts);
 
-        $file = file_get_contents($this->nclink.'/api/tm/startbreak/'.$this->userSession->getUser()->getUId().'/87zuhjk87GHJ546tzgvhas76aaskbdhr45edfVHAKia87s6gbAVGFGSR3451627gBHAKJBN', false, $context);
+        $file = file_get_contents($this->myUrlEncode($this->nclink.'/api/tm/startbreak/'.$this->removeMail($this->userSession->getUser()->getUId()).'/87zuhjk87GHJ546tzgvhas76aaskbdhr45edfVHAKia87s6gbAVGFGSR3451627gBHAKJBN'), false, $context);
 		#$response = new TemplateResponse('da_agency', 'realtimeclock', ['userId' => $this->userSession->getUser()->getUID(), 'data' => "none"]);
 		return new DataResponse($file);
 	}
 
 	/**
 	 * @NoCSRFRequired
+	 * @NoAdminRequired
 	 * 
 	 * Beendet einen Arbeitstag
 	 */
@@ -128,12 +145,12 @@ class PageController extends Controller {
         ];
         $context = stream_context_create($opts);
 
-        $file = file_get_contents($this->nclink.'/api/tm/endbreak/'.$this->userSession->getUser()->getUId().'/87zuhjk87GHJ546tzgvhas76aaskbdhr45edfVHAKia87s6gbAVGFGSR3451627gBHAKJBN', false, $context);
+        $file = file_get_contents($this->myUrlEncode($this->nclink.'/api/tm/endbreak/'.$this->removeMail($this->userSession->getUser()->getUId()).'/87zuhjk87GHJ546tzgvhas76aaskbdhr45edfVHAKia87s6gbAVGFGSR3451627gBHAKJBN'), false, $context);
 		#$response = new TemplateResponse('da_agency', 'realtimeclock', ['userId' => $this->userSession->getUser()->getUID(), 'data' => "none"]);
 		return new DataResponse($file);
 	}
 
-
+	
 	/**
 	 * @NoCSRFRequired
 	 * @NoAdminRequired
@@ -153,7 +170,7 @@ class PageController extends Controller {
         ];
         $context = stream_context_create($opts);
 
-        $file = file_get_contents($this->nclink.'/api/tm/gettime/'.$this->userSession->getUser()->getUId().'/87zuhjk87GHJ546tzgvhas76aaskbdhr45edfVHAKia87s6gbAVGFGSR3451627gBHAKJBN', false, $context);
+        $file = file_get_contents($this->myUrlEncode($this->nclink.'/api/tm/gettime/'.$this->removeMail($this->userSession->getUser()->getUId()).'/87zuhjk87GHJ546tzgvhas76aaskbdhr45edfVHAKia87s6gbAVGFGSR3451627gBHAKJBN'), false, $context);
 		return new DataResponse($file);
 	}
 }
\ No newline at end of file
diff --git a/lib/Controller/PublicController.php b/lib/Controller/PublicController.php
index 06d303d..8eba5d3 100644
--- a/lib/Controller/PublicController.php
+++ b/lib/Controller/PublicController.php
@@ -35,6 +35,7 @@ class PublicController extends OCSController {
     /**
 	 * 
      * @NoCSRFRequired
+     * @NoAdminRequired
 	 */
     public function createGroupFolder(string $gid, string $aid, bool $newagency=false): DataResponse{
         if($newagency == false){
@@ -62,6 +63,7 @@ class PublicController extends OCSController {
     /**
 	 * 
      * @NoCSRFRequired
+     * @NoAdminRequired
 	 */
     public function renameAgencyGroup(string $name, string $id): DataResponse{
         $this->groupManager->get($id)->setDisplayName($name);