diff --git a/app/src/main/java/be/ugent/sel/studeez/common/composable/TextFieldComposable.kt b/app/src/main/java/be/ugent/sel/studeez/common/composable/TextFieldComposable.kt
index 0b39a24..5766607 100644
--- a/app/src/main/java/be/ugent/sel/studeez/common/composable/TextFieldComposable.kt
+++ b/app/src/main/java/be/ugent/sel/studeez/common/composable/TextFieldComposable.kt
@@ -9,6 +9,7 @@ import androidx.compose.material.Text
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Email
 import androidx.compose.material.icons.filled.Lock
+import androidx.compose.material.icons.filled.Person
 import androidx.compose.runtime.*
 import be.ugent.sel.studeez.R.string as AppText
 import be.ugent.sel.studeez.R.drawable as AppIcon
@@ -35,6 +36,22 @@ fun BasicField(
     )
 }
 
+@Composable
+fun UsernameField(
+    value: String,
+    onNewValue: (String) -> Unit,
+    modifier: Modifier = Modifier
+) {
+    OutlinedTextField(
+        singleLine = true,
+        modifier = modifier,
+        value = value,
+        onValueChange = { onNewValue(it) },
+        placeholder = { Text(stringResource(AppText.username)) },
+        leadingIcon = { Icon(imageVector = Icons.Default.Person, contentDescription = "Username") }
+    )
+}
+
 @Composable
 fun EmailField(
     value: String,
diff --git a/app/src/main/java/be/ugent/sel/studeez/di/DatabaseModule.kt b/app/src/main/java/be/ugent/sel/studeez/di/DatabaseModule.kt
index ffad868..c82696e 100644
--- a/app/src/main/java/be/ugent/sel/studeez/di/DatabaseModule.kt
+++ b/app/src/main/java/be/ugent/sel/studeez/di/DatabaseModule.kt
@@ -2,7 +2,9 @@ package be.ugent.sel.studeez.di
 
 import be.ugent.sel.studeez.domain.AccountDAO
 import be.ugent.sel.studeez.domain.LogService
+import be.ugent.sel.studeez.domain.UserDAO
 import be.ugent.sel.studeez.domain.implementation.FirebaseAccountDAO
+import be.ugent.sel.studeez.domain.implementation.FirebaseUserDAO
 import be.ugent.sel.studeez.domain.implementation.LogServiceImpl
 import dagger.Binds
 import dagger.Module
@@ -14,6 +16,8 @@ import dagger.hilt.components.SingletonComponent
 abstract class DatabaseModule {
     @Binds abstract fun provideAccountDAO(impl: FirebaseAccountDAO): AccountDAO
 
+    @Binds abstract fun provideUserDAO(impl: FirebaseUserDAO): UserDAO
+
     @Binds abstract fun provideLogService(impl: LogServiceImpl): LogService
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/be/ugent/sel/studeez/domain/UserDAO.kt b/app/src/main/java/be/ugent/sel/studeez/domain/UserDAO.kt
new file mode 100644
index 0000000..28999e6
--- /dev/null
+++ b/app/src/main/java/be/ugent/sel/studeez/domain/UserDAO.kt
@@ -0,0 +1,10 @@
+package be.ugent.sel.studeez.domain
+
+import kotlinx.coroutines.flow.Flow
+
+interface UserDAO {
+
+    suspend fun getUserName(): String?
+
+    suspend fun save(newUsername: String)
+}
\ No newline at end of file
diff --git a/app/src/main/java/be/ugent/sel/studeez/domain/implementation/FirebaseUserDAO.kt b/app/src/main/java/be/ugent/sel/studeez/domain/implementation/FirebaseUserDAO.kt
new file mode 100644
index 0000000..ac8f455
--- /dev/null
+++ b/app/src/main/java/be/ugent/sel/studeez/domain/implementation/FirebaseUserDAO.kt
@@ -0,0 +1,29 @@
+package be.ugent.sel.studeez.domain.implementation
+
+import be.ugent.sel.studeez.domain.AccountDAO
+import be.ugent.sel.studeez.domain.UserDAO
+import com.google.firebase.firestore.DocumentReference
+import com.google.firebase.firestore.FirebaseFirestore
+import kotlinx.coroutines.tasks.await
+import javax.inject.Inject
+
+class FirebaseUserDAO @Inject constructor(
+    private val firestore: FirebaseFirestore,
+    private val auth: AccountDAO
+    ) : UserDAO {
+
+    override suspend fun getUserName(): String? {
+        return currentUserDocument().get().await().getString("username")
+    }
+
+    override suspend fun save(newUsername: String) {
+        currentUserDocument().set(mapOf("username" to newUsername))
+    }
+
+    private fun currentUserDocument(): DocumentReference =
+        firestore.collection(USER_COLLECTION).document(auth.currentUserId)
+
+    companion object {
+        private const val USER_COLLECTION = "users"
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/be/ugent/sel/studeez/screens/sign_up/SignUpScreen.kt b/app/src/main/java/be/ugent/sel/studeez/screens/sign_up/SignUpScreen.kt
index 9eb9dea..19ff103 100644
--- a/app/src/main/java/be/ugent/sel/studeez/screens/sign_up/SignUpScreen.kt
+++ b/app/src/main/java/be/ugent/sel/studeez/screens/sign_up/SignUpScreen.kt
@@ -6,6 +6,8 @@ import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Person
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
@@ -36,9 +38,30 @@ fun SignUpScreen(
             verticalArrangement = Arrangement.Center,
             horizontalAlignment = Alignment.CenterHorizontally
         ) {
-            EmailField(uiState.email, viewModel::onEmailChange, fieldModifier)
-            PasswordField(uiState.password, viewModel::onPasswordChange, fieldModifier)
-            RepeatPasswordField(uiState.repeatPassword, viewModel::onRepeatPasswordChange, fieldModifier)
+
+            UsernameField(
+                uiState.username,
+                viewModel::onUsernameChange,
+                fieldModifier
+            )
+
+            EmailField(
+                uiState.email,
+                viewModel::onEmailChange,
+                fieldModifier
+            )
+
+            PasswordField(
+                uiState.password,
+                viewModel::onPasswordChange,
+                fieldModifier
+            )
+
+            RepeatPasswordField(
+                uiState.repeatPassword,
+                viewModel::onRepeatPasswordChange,
+                fieldModifier
+            )
 
             BasicButton(AppText.create_account, Modifier.basicButton()) {
                 viewModel.onSignUpClick(openAndPopUp)
diff --git a/app/src/main/java/be/ugent/sel/studeez/screens/sign_up/SignUpUiState.kt b/app/src/main/java/be/ugent/sel/studeez/screens/sign_up/SignUpUiState.kt
index 081eb42..48a5178 100644
--- a/app/src/main/java/be/ugent/sel/studeez/screens/sign_up/SignUpUiState.kt
+++ b/app/src/main/java/be/ugent/sel/studeez/screens/sign_up/SignUpUiState.kt
@@ -1,6 +1,7 @@
 package be.ugent.sel.studeez.screens.sign_up
 
 data class SignUpUiState(
+    val username: String = "",
     val email: String = "",
     val password: String = "",
     val repeatPassword: String = ""
diff --git a/app/src/main/java/be/ugent/sel/studeez/screens/sign_up/SignUpViewModel.kt b/app/src/main/java/be/ugent/sel/studeez/screens/sign_up/SignUpViewModel.kt
index a22fe68..dacb7db 100644
--- a/app/src/main/java/be/ugent/sel/studeez/screens/sign_up/SignUpViewModel.kt
+++ b/app/src/main/java/be/ugent/sel/studeez/screens/sign_up/SignUpViewModel.kt
@@ -7,26 +7,37 @@ import be.ugent.sel.studeez.common.ext.passwordMatches
 import be.ugent.sel.studeez.common.snackbar.SnackbarManager
 import be.ugent.sel.studeez.domain.AccountDAO
 import be.ugent.sel.studeez.domain.LogService
+import be.ugent.sel.studeez.domain.UserDAO
+import be.ugent.sel.studeez.navigation.StudeezDestinations.HOME_SCREEN
 import be.ugent.sel.studeez.navigation.StudeezDestinations.LOGIN_SCREEN
 import be.ugent.sel.studeez.navigation.StudeezDestinations.SIGN_UP_SCREEN
 import be.ugent.sel.studeez.screens.StudeezViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.flow.FlowCollector
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.take
 import be.ugent.sel.studeez.R.string as AppText
 import javax.inject.Inject
 
 @HiltViewModel
 class SignUpViewModel @Inject constructor(
-    private val accountService: AccountDAO,
+    private val accountDAO: AccountDAO,
+    private val userDAO: UserDAO,
     logService: LogService
     ) : StudeezViewModel(logService) {
     var uiState = mutableStateOf(SignUpUiState())
         private set
 
+    private val username
+        get() = uiState.value.username
     private val email
         get() = uiState.value.email
     private val password
         get() = uiState.value.password
 
+    fun onUsernameChange(newValue: String) {
+        uiState.value = uiState.value.copy(username = newValue)
+    }
     fun onEmailChange(newValue: String) {
         uiState.value = uiState.value.copy(email = newValue)
     }
@@ -56,8 +67,10 @@ class SignUpViewModel @Inject constructor(
         }
 
         launchCatching {
-            accountService.signUpWithEmailAndPassword(email, password)
-            openAndPopUp(LOGIN_SCREEN, SIGN_UP_SCREEN)
+            accountDAO.signUpWithEmailAndPassword(email, password)
+            accountDAO.signInWithEmailAndPassword(email, password)
+            userDAO.save(username)
+            openAndPopUp(HOME_SCREEN, SIGN_UP_SCREEN)
         }
     }
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 672586e..d070672 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,6 +1,7 @@
 <resources>
     <!-- Common -->
     <string name="app_name">Studeez</string>
+    <string name="username">Username</string>
     <string name="email">Email</string>
     <string name="password">Password</string>
     <string name="repeat_password">Repeat password</string>
@@ -17,6 +18,7 @@
     <string name="password_match_error">Passwords do not match.</string>
     <string name="already_user">Already have an account? Log in.</string>
 
+
     <!-- LoginScreen -->
     <string name="not_already_user">Don\'t have an account yet? Sign up.</string>
     <string name="sign_in">Sign in</string>