diff --git a/app/Http/Controllers/oAuthController.php b/app/Http/Controllers/oAuthController.php
index 408b1bf..79713a8 100644
--- a/app/Http/Controllers/oAuthController.php
+++ b/app/Http/Controllers/oAuthController.php
@@ -58,7 +58,10 @@ class oAuthController extends Controller
 
             }
             $appCode = AppCode::createCode($access);
-            $returnUrl.="code=".$appCode->code."&state=".$request->input("state");
+	    $returnUrl.="code=".$appCode->code;
+	    if($request->input("state", null) !== null) {
+	    	$returnUrl .= "&state=".$request->input("state");
+	    }
 
             Log::debug("Return URL: ".$returnUrl);