diff --git a/src/server/backend/db/db.js b/src/server/backend/db/db.js
index 26fb727..6555955 100644
--- a/src/server/backend/db/db.js
+++ b/src/server/backend/db/db.js
@@ -59,6 +59,21 @@ module.exports.writeDataSimple = ( db, column, searchQuery, data ) => {
     } );
 };
 
+module.exports.checkDataAvailability = ( db, column, searchQuery ) => {
+    return new Promise( ( resolve, reject ) => {
+        dbh.query( { 'command': 'checkDataAvailability', 'property': column, 'searchQuery': searchQuery }, dbRef[ db ] ).then( res => {
+            if ( res.length > 0 ) {
+                resolve( true );
+            } else {
+                resolve( false );
+            }
+        } ).catch( error => {
+            reject( error );
+        } );
+    } );
+};
+
+
 module.exports.getJSONData = ( file ) => {
     return new Promise( ( resolve, reject ) => {
         fs.readFile( path.join( __dirname + '/data/' + file + '.json' ), ( error, data ) => {
diff --git a/src/server/backend/userRoutes.js b/src/server/backend/userRoutes.js
index 41efb32..9ace9a2 100644
--- a/src/server/backend/userRoutes.js
+++ b/src/server/backend/userRoutes.js
@@ -140,9 +140,20 @@ module.exports = ( app, settings ) => {
     app.post( '/user/signup', bodyParser.json(), ( request, response ) => {
         // TODO: Make sure that user does not exist yet first and if user 
         // exists, send back info that it is that way
-        response.send( 'ok' );
-        db.writeDataSimple( 'users', 'email', request.body.email, { 'pass': pwdmanager.hashPassword( request.query.password ), 'street': '', 'house_number': '', 'country': request.query.country, 'first_name': request.query.firstName, 'name': request.query.name, 'two_fa': String( request.query.twoFA ) } ).then( res => {
-            console.log( res );
-        } );
+        // TODO: check for 2fa
+        // TODO: Send mail to confirm email address
+        if ( request.body.password && request.body.password === request.body.password2 && request.body.firstName && request.body.name && request.body.country && request.body.mail ) {
+            db.checkDataAvailability( 'users', 'email', request.body.mail ).then( status => {
+                if ( status ) {
+                    response.send( 'exists' );
+                } else {
+                    db.writeDataSimple( 'users', 'email', request.body.mail, { 'pass': pwdmanager.hashPassword( request.body.password ), 'first_name': request.body.firstName, 'name': request.body.name, 'two_fa': String( request.body.twoFA ), 'user_data': { 'country': request.body.country } } ).then( () => {
+                        response.send( 'ok' );
+                    } );
+                }
+            } );
+        } else {
+            response.status( 400 ).send( 'incomplete' );
+        }
     } );
 };
\ No newline at end of file
diff --git a/src/webapp/main/src/views/user/LoginView.vue b/src/webapp/main/src/views/user/LoginView.vue
index f8f1ec0..8a627dc 100644
--- a/src/webapp/main/src/views/user/LoginView.vue
+++ b/src/webapp/main/src/views/user/LoginView.vue
@@ -19,6 +19,7 @@
             </form>
             <button @click="login();" class="button">Log in</button>
             <router-link to="/signup" class="button">Sign up instead</router-link>
+            <router-link to="/password-reset" class="button">Reset password</router-link>
         </div>
         <notifications ref="notification" location="topright" size="bigger"></notifications>
     </div>
diff --git a/src/webapp/main/src/views/user/SignupView.vue b/src/webapp/main/src/views/user/SignupView.vue
index 41a7363..f3f12fe 100644
--- a/src/webapp/main/src/views/user/SignupView.vue
+++ b/src/webapp/main/src/views/user/SignupView.vue
@@ -12,15 +12,40 @@
         <div class="login-app">
             <h1>Sign up</h1>
             <form>
-                <label for="mail">Email</label><br>
-                <input type="email" v-model="formData[ 'mail' ]" name="mail" id="mail" required><br><br>
-                <label for="name">Full name</label><br>
-                <input type="text" v-model="formData[ 'name' ]" name="name" id="name" required><br><br>
-                <label for="password">Password</label><br>
-                <input type="password" v-model="formData[ 'password' ]" name="password" id="password" required><br><br>
-                <label for="password2">Confirm password</label><br>
-                <input type="password" v-model="formData[ 'password2' ]" name="password2" id="password2" required>
+                <table>
+                    <tr>
+                        <td>
+                            <label for="mail">Email</label><br>
+                            <input type="email" v-model="formData[ 'mail' ]" name="mail" id="mail" required><br><br>
+                        </td>
+                        <td>
+                            <label for="country">Country</label><br>
+                            <input type="text" v-model="formData[ 'country' ]" name="country" id="country" required><br><br>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>
+                            <label for="firstName">First name</label><br>
+                            <input type="text" v-model="formData[ 'firstName' ]" name="firstName" id="firstName" required><br><br>
+                        </td>
+                        <td>
+                            <label for="name">Last name</label><br>
+                            <input type="text" v-model="formData[ 'name' ]" name="name" id="name" required><br><br>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>
+                            <label for="password">Password</label><br>
+                            <input type="password" v-model="formData[ 'password' ]" name="password" id="password" required><br><br>
+                        </td>
+                        <td>
+                            <label for="password2">Confirm password</label><br>
+                            <input type="password" v-model="formData[ 'password2' ]" name="password2" id="password2" required><br><br>
+                        </td>
+                    </tr>
+                </table>
             </form>
+            <notifications ref="notification" location="topright" size="bigger"></notifications>
             <button @click="signup();" class="button">Sign up</button>
             <router-link to="/login" class="button">Log in instead</router-link>
         </div>
@@ -28,15 +53,73 @@
 </template>
 
 <script>
+    import { useUserStore } from '@/stores/userStore';
+    import { mapStores } from 'pinia';
+    import notifications from '@/components/notifications/notifications.vue';
+
     export default {
         data () {
             return {
                 formData: {}
             }
         },
+        components: {
+            notifications,
+        },
+        computed: {
+            ...mapStores( useUserStore )
+        },
         methods: {
             signup () {
-
+                if ( !this.formData.mail ) {
+                    this.$refs.notification.createNotification( 'An email address is required to sign up', 5, 'error', 'normal' );
+                    return;
+                }
+                if ( !this.formData.password ) {
+                    this.$refs.notification.createNotification( 'A password is required to sign up', 5, 'error', 'normal' );
+                    return;
+                }
+                if ( !this.formData.password2 ) {
+                    this.$refs.notification.createNotification( 'Please confirm your password using the "Confirm password field"', 5, 'error', 'normal' );
+                    return;
+                }
+                if ( this.formData.password !== this.formData.password2 ) {
+                    this.$refs.notification.createNotification( 'The passwords provided do not match. Please ensure they are the same', 5, 'error', 'normal' );
+                    return;
+                }
+                if ( !this.formData.country ) {
+                    this.$refs.notification.createNotification( 'Please provide the country you live in.', 5, 'error', 'normal' );
+                    return;
+                }
+                if ( !this.formData.name && !this.formData.firstName ) {
+                    this.$refs.notification.createNotification( 'Please provide your first and last name!', 5, 'error', 'normal' );
+                    return;
+                }
+                let progress = this.$refs.notification.createNotification( 'Signing up...', 20, 'progress', 'normal' );
+                let fetchOptions = {
+                    method: 'post',
+                    body: JSON.stringify( this.formData ),
+                    headers: {
+                        'Content-Type': 'application/json',
+                        'charset': 'utf-8'
+                    }
+                };
+                fetch( localStorage.getItem( 'url' ) + '/user/signup', fetchOptions ).then( res => {
+                    console.log( res );
+                    res.text().then( status => {
+                        if ( status === 'ok' ) {
+                            this.userStore.setUserAuth( true );
+                            this.$router.push( sessionStorage.getItem( 'redirect' ) ?? '/account' );
+                            sessionStorage.removeItem( 'redirect' );
+                        } else if ( status === 'exists' ) {
+                            this.$refs.notification.cancelNotification( progress );
+                            this.$refs.notification.createNotification( 'An account with this email address already exists. Please log in using it.', 5, 'error', 'normal' );
+                            this.$refs.notification.createNotification( 'If you do not remember your password, reset it!', 5, 'error', 'normal' );
+                        } else {
+                            console.log( status );
+                        }
+                    } );
+                } );
             }
         },
     }