diff --git a/src/server/setup/setupRoutes.js b/src/server/setup/setupRoutes.js
index a497e11..d6dd0bd 100644
--- a/src/server/setup/setupRoutes.js
+++ b/src/server/setup/setupRoutes.js
@@ -54,6 +54,7 @@ module.exports = ( app, settings ) => {
             }
             let updatedSettings = settings;
             updatedSettings[ 'name' ] = req.body.websiteName;
+            updatedSettings[ 'yourDomain' ] = req.body.yourDomain;
             updatedSettings[ 'mailSender' ] = req.body.mailDisplay;
             db.saveSettings( updatedSettings );
             res.send( 'ok' );
diff --git a/src/webapp/setup/src/views/BasicSetupView.vue b/src/webapp/setup/src/views/BasicSetupView.vue
index 3310db9..1406a50 100644
--- a/src/webapp/setup/src/views/BasicSetupView.vue
+++ b/src/webapp/setup/src/views/BasicSetupView.vue
@@ -17,6 +17,8 @@
             <h2>General information</h2>
             <label for="name">Name of the website</label><br>
             <input type="text" name="name" id="name" v-model="formData.websiteName"><br>
+            <label for="name">URL of the website</label><br>
+            <input type="text" name="domain" id="domain" v-model="formData.yourDomain"><br>
             
 
             <h2>Database</h2>
@@ -108,7 +110,6 @@ export default {
     },
     methods: {
         submit() {
-            this.collectUrl();
             if ( this.formData.dbType === 'mysql' ) {
                 if ( !this.formData.db.port || !this.formData.db.host || !this.formData.db.database || !this.formData.db.user || !this.formData.db.password ) {
                     this.$refs.notification.createNotification( 'Database settings are not complete!', 5, 'error', 'normal' );
@@ -149,7 +150,7 @@ export default {
             this.$router.push( '/setup/root' );
         },
         collectUrl() {
-            this.formData.yourDomain = location.protocol + '//' + location.host;
+            this.formData.yourDomain = location.protocol + '//' + location.host + ( location.port ? ':' + location.port : '' );
             this.formData.db.host = location.hostname;
         }
     },
@@ -157,6 +158,7 @@ export default {
         if ( sessionStorage.getItem( 'basics' ) ) {
             this.formData = JSON.parse( sessionStorage.getItem( 'basics' ) );
         }
+        this.collectUrl();
     }
 };
 </script>
diff --git a/src/webapp/setup/src/views/SetupRootView.vue b/src/webapp/setup/src/views/SetupRootView.vue
index 6924a92..2f50066 100644
--- a/src/webapp/setup/src/views/SetupRootView.vue
+++ b/src/webapp/setup/src/views/SetupRootView.vue
@@ -124,15 +124,14 @@ export default {
                             let requirementsCount = { 'special': 0, 'numbers': 0, 'lower': 0, 'upper': 0, 'incorrect': '' };
                             const pw = this.formData.password;
                             for ( let l in pw ) {
-                                console.log( pw[ l ] );
                                 if ( /[a-z]/.test( pw[ l ] ) ) {
                                     requirementsCount[ 'lower' ] += 1;
                                 } else if ( /[A-Z]/.test( pw[ l ] ) ) {
                                     requirementsCount[ 'upper' ] += 1;
                                 } else if ( lookup.includes( pw[ l ] ) ) {
                                     requirementsCount[ 'special' ] += 1;
-                                } else if ( !isNaN( pw[ l ] * 1 ) ) {
-                                    requirementsCount[ 'number' ] += 1;
+                                } else if ( !isNaN( pw[ l ] ) ) {
+                                    requirementsCount[ 'numbers' ] += 1;
                                 } else {
                                     console.log( 'incorrect letter' );
                                     requirementsCount[ 'incorrect' ] = pw[ l ];