diff --git a/src/error.html b/src/error.html
index d7183f8b0..806a634a7 100644
--- a/src/error.html
+++ b/src/error.html
@@ -1,30 +1,30 @@
 <!DOCTYPE html>
 <html ng-app="Application" ng-controller="Controller">
 <head>
-    <meta charset="utf-8" />
-    <meta name="viewport" content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width, height=device-height" />
+  <meta charset="utf-8" />
+  <meta name="viewport" content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width, height=device-height" />
 
-    <title> Cloudron Error </title>
+  <title> Cloudron Error </title>
 
-    <link id="favicon" type="image/png" rel="icon" href="/api/v1/cloudron/avatar">
+  <link id="favicon" type="image/png" rel="icon" href="/api/v1/cloudron/avatar">
 
-    <!-- Theme CSS -->
-    <link type="text/css" rel="stylesheet" href="/theme.css">
+  <!-- Theme CSS -->
+  <link type="text/css" rel="stylesheet" href="/theme.css">
 
-    <!-- external fonts and CSS -->
-    <link type="text/css" rel="stylesheet" href="/3rdparty/fontawesome/css/all.min.css">
+  <!-- external fonts and CSS -->
+  <link type="text/css" rel="stylesheet" href="/3rdparty/fontawesome/css/all.min.css">
 
-    <!-- jQuery-->
-    <script type="text/javascript" src="/3rdparty/js/jquery.min.js"></script>
+  <!-- jQuery-->
+  <script type="text/javascript" src="/3rdparty/js/jquery.min.js"></script>
 
-    <!-- Bootstrap Core JavaScript -->
-    <script type="text/javascript" src="/3rdparty/js/bootstrap.min.js"></script>
+  <!-- Bootstrap Core JavaScript -->
+  <script type="text/javascript" src="/3rdparty/js/bootstrap.min.js"></script>
 
-    <!-- Angularjs scripts -->
-    <script type="text/javascript" src="/3rdparty/js/angular.min.js"></script>
-    <script type="text/javascript" src="/3rdparty/js/angular-loader.min.js"></script>
+  <!-- Angularjs scripts -->
+  <script type="text/javascript" src="/3rdparty/js/angular.min.js"></script>
+  <script type="text/javascript" src="/3rdparty/js/angular-loader.min.js"></script>
 
-    <script>
+  <script>
 
         'use strict';
 
@@ -50,56 +50,39 @@
 
             var search = window.location.search.slice(1).split('&').map(function (item) { return item.split('='); }).reduce(function (o, k) { o[k[0]] = k[1]; return o; }, {});
 
-            $scope.errorCode = search.errorCode || 0;
             $scope.errorContext = search.errorContext || '';
         }]);
 
-    </script>
+  </script>
 
-    <style>
+  <style>
 
     h3 {
         padding-bottom: 15px;
     }
 
-    </style>
+  </style>
 
 </head>
 
 <body class="status-page">
 
 <div class="wrapper">
-    <div class="content">
-        <img ng-src="avatarUrl" width="128" height="128" onerror="this.src = '/img/logo.png'"/>
-        <h1> Cloudron </h1>
-
-        <div ng-show="errorCode == 0">
-            <h3> <i class="far fa-frown fa-fw text-danger"></i> Something has gone wrong </h3>
-            <a class="btn btn-primary" href="/" ng-show="statusOk">Back to the dashboard</a>
-        </div>
-
-        <div ng-show="errorCode == 1">
-            <h3> <i class="far fa-frown fa-fw text-danger"></i> Cloudron is not setup </h3>
-            Please use the setup link you received via mail.
-        </div>
-
-        <div ng-show="errorCode == 2">
-            <h3> <i class="far fa-frown fa-fw text-danger"></i> Setup requires a setupToken in the query </h3>
-            Please use the setup link you received via mail.
-        </div>
-
-        <div ng-show="errorCode == 3">
-            <h3> <i class="far fa-frown fa-fw text-danger"></i> Setup requires an email in the query </h3>
-            Please use the setup link you received via mail.
-        </div>
+  <div class="content">
+    <img ng-src="avatarUrl" width="128" height="128" onerror="this.src = '/img/logo.png'"/>
+    <h1> Cloudron </h1>
+    <div>
+      <h3> <i class="far fa-frown fa-fw text-danger"></i> Something has gone wrong </h3>
+      <a class="btn btn-primary" href="/" ng-show="statusOk">Back to the dashboard</a>
     </div>
+  </div>
 </div>
 
 
 <footer class="text-center">
-    <span class="text-muted">&copy;2018 <a href="https://cloudron.io" target="_blank">Cloudron</a></span>
-    <span class="text-muted"><a href="https://twitter.com/cloudron_io" target="_blank">Twitter <i class="fab fa-twitter"></i></a></span>
-    <span class="text-muted"><a href="https://forum.cloudron.io" target="_blank">Forum <i class="fa fa-comments"></i></a></span>
+  <span class="text-muted">&copy;2018 <a href="https://cloudron.io" target="_blank">Cloudron</a></span>
+  <span class="text-muted"><a href="https://twitter.com/cloudron_io" target="_blank">Twitter <i class="fab fa-twitter"></i></a></span>
+  <span class="text-muted"><a href="https://forum.cloudron.io" target="_blank">Forum <i class="fa fa-comments"></i></a></span>
 </footer>
 
 </body>
diff --git a/src/js/setup.js b/src/js/setup.js
index 489f5d67d..cf7dd1f3e 100644
--- a/src/js/setup.js
+++ b/src/js/setup.js
@@ -68,16 +68,6 @@ app.controller('SetupController', ['$scope', '$http', 'Client', function ($scope
         }
 
         if (status.provider === 'caas') {
-            if (!search.setupToken) {
-                window.location.href = '/error.html?errorCode=2';
-                return;
-            }
-
-            if (!search.email) {
-                window.location.href = '/error.html?errorCode=3';
-                return;
-            }
-
             $scope.setupToken = search.setupToken;
         }
 
