diff --git a/application/controllers/AuthenticationController.php b/application/controllers/AuthenticationController.php
index 1934b77..7e8a057 100644
--- a/application/controllers/AuthenticationController.php
+++ b/application/controllers/AuthenticationController.php
@@ -74,9 +74,9 @@ public function realmAction(){
 
 
             if($oidc->authenticate()){
-                if(isset($_COOKIE['oidc-redirect'])){
+                if( !empty($_COOKIE['oidc-redirect']) ){
                     $redirect = $_COOKIE['oidc-redirect'];
-                    setcookie("oidc-redirect", $redirect, time() -3600, "/icingaweb2/");
+                    setcookie("oidc-redirect", "", time() -3600, "/icingaweb2/");
                 }
 
                 $authSuccess=true;
diff --git a/library/Oidc/LoginFormModifierHelper.php b/library/Oidc/LoginFormModifierHelper.php
index a686809..074bde6 100644
--- a/library/Oidc/LoginFormModifierHelper.php
+++ b/library/Oidc/LoginFormModifierHelper.php
@@ -15,9 +15,11 @@ class LoginFormModifierHelper
     public static function init()
     {
 
-        $redirect = $_GET['redirect'];
-        if(! empty($redirect)){
-            setcookie("oidc-redirect", $redirect, time() + 300, "/icingaweb2/");
+        if(! empty($_GET['redirect'])){
+            setcookie("oidc-redirect", $_GET['redirect'], time() + 300, "/icingaweb2/");
+        }else{
+            setcookie("oidc-redirect", "", time() -3600, "/icingaweb2/");
+
         }
 
     }
diff --git a/module.info b/module.info
index c52beb2..90779a1 100644
--- a/module.info
+++ b/module.info
@@ -1,5 +1,5 @@
 Name: oidc
-Version: 0.5.9
+Version: 0.6.0
 Requires:
   Libraries: icinga-php-library (>=0.13.0), icinga-php-thirdparty (>=0.12.0)
 Description: oidc