diff --git a/src/server/setup/homePageCompiler.js b/src/server/setup/homePageCompiler.js
new file mode 100644
index 0000000..e69de29
diff --git a/src/webapp/main/src/views/user/SignupView.vue b/src/webapp/main/src/views/user/SignupView.vue
index a6be8d7..f6de975 100644
--- a/src/webapp/main/src/views/user/SignupView.vue
+++ b/src/webapp/main/src/views/user/SignupView.vue
@@ -157,6 +157,11 @@
                     this.$refs.notification.createNotification( 'Please provide your first and last name!', 5, 'error', 'normal' );
                     return;
                 }
+
+                if ( !this.checkEmail() ) {
+                    this.$refs.notification.createNotification( 'This email address is not an email address', 5, 'error', 'normal' );
+                    return;
+                }
                 let progress = this.$refs.notification.createNotification( 'Signing up...', 20, 'progress', 'normal' );
                 let fetchOptions = {
                     method: 'post',
@@ -166,9 +171,7 @@
                         'charset': 'utf-8'
                     }
                 };
-                console.log( 'signup initiated' )
                 fetch( localStorage.getItem( 'url' ) + '/user/signup', fetchOptions ).then( res => {
-                    console.log( res )
                     res.text().then( status => {
                         if ( status === 'ok' ) {
                             this.$refs.notification.cancelNotification( progress );
diff --git a/src/webapp/setup/src/views/BasicSetupView.vue b/src/webapp/setup/src/views/BasicSetupView.vue
index cfb7ec8..3ac6337 100644
--- a/src/webapp/setup/src/views/BasicSetupView.vue
+++ b/src/webapp/setup/src/views/BasicSetupView.vue
@@ -13,6 +13,12 @@
             <h1>Basic Setup</h1>
             <p>To make setting up the database and email accounts easier, you can enter the required values below.</p>
             <p>You may find more infos about this part <a href="https://libreevent.janishutz.com/docs/setup/setup#basic-setup" target="_blank">here</a></p>
+
+            <h2>General information</h2>
+            <label for="name">Name of the website</label><br>
+            <input type="text" name="name" id="name" v-model="websiteName"><br>
+            
+
             <h2>Database</h2>
             <p>A database is a piece of software that specializes in storing data. libreevent can use most SQL based databases as well as a custom JSON-based database. You are strongly encouraged to use a SQL based database, as they perform significantly better. Read more 
                 <a href="https://libreevent.janishutz.com/docs/setup/installation#database" target="_blank">here</a>
diff --git a/src/webapp/setup/src/views/SetupPageView.vue b/src/webapp/setup/src/views/SetupPageView.vue
index ce77872..4e84b92 100644
--- a/src/webapp/setup/src/views/SetupPageView.vue
+++ b/src/webapp/setup/src/views/SetupPageView.vue
@@ -15,13 +15,10 @@
             <p>You may find more infos about this part <a href="https://libreevent.janishutz.com/docs/setup/setup#page-setup" target="_blank">here</a></p>
 
             <label for="template">Choose a template</label><br>
-            <select name="template" id="template" v-for="option in options" :key="option.id">
-                <option :value="option.id">{{ option.name }}</option>
+            <select name="template" id="template" >
+                <option v-for="option in options" :key="option.id" :value="option.id">{{ option.name }}</option>
             </select><br>
 
-            <label for="name">Name of the website</label><br>
-            <input type="text" name="name" id="name" v-model="websiteName"><br>
-
             <button @click="submit()" class="button">Continue</button>
         </div>
     </div>
@@ -34,7 +31,10 @@
     export default {
         data () {
             return {
-                options: { 'default': { 'id': 'default', 'name': 'Default' } },
+                options: { 
+                    'default': { 'id': 'default', 'name': 'Default' },
+                    'none': { 'id': 'none', 'name': 'Configure later (will show an empty page)' },
+                },
                 websiteName: 'libreevent',
             }
         },
diff --git a/src/webapp/setup/src/views/SetupRootView.vue b/src/webapp/setup/src/views/SetupRootView.vue
index c0d3222..7a65027 100644
--- a/src/webapp/setup/src/views/SetupRootView.vue
+++ b/src/webapp/setup/src/views/SetupRootView.vue
@@ -156,7 +156,9 @@
                                     }
                                 }
                             } else {
-                                this.proceed();
+                                if ( confirm( 'Do you really want to proceed without having your password checked?' ) ) {
+                                    this.proceed();
+                                }
                             }
                         } else {
                             this.$refs.notification.createNotification( 'Passwords do not match', 10, 'error', 'normal' );