diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 484a7cc0..d5295634 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -121,6 +121,34 @@
                 <data android:path="/${tiqr_config_enroll_path_param}/" />
             </intent-filter>
             <!--
+            Change email confirmation link: The link in the validation email is https://login.{environment}.eduid.nl/client/mobile/update-email?h=={{hash}}with an unique 'h' query param which must be used in 'mobile/api/sp/confirm-email' to confirm the update.
+            If the URL is not properly intercepted by the eduID app, then the browser app redirects to eduid://client/mobile/confirm-email?h={{hash}}-->
+            <intent-filter android:autoVerify="true">
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:host="*.eduid.nl"
+                    android:pathPrefix="/client/mobile/update-email"
+                    android:scheme="https" />
+
+            </intent-filter>
+            <!--            In case we need to support the custom scheme while on mobile?-->
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:host="*"
+                    android:path="/client/mobile/update-email"
+                    android:scheme="eduid" />
+
+            </intent-filter>
+            <!--
             Sent the user a mail with a link for the user to change their password.
              Reset password: Link in the validation email is https://login.{environment}.eduid.nl/client/mobile/reset-password?h={{hash}} if the user already had a password.
              Add password: https://login.{environment}.eduid.nl/client/mobile/add-password?h={{hash}}
diff --git a/app/src/main/kotlin/nl/eduid/di/api/EduIdApi.kt b/app/src/main/kotlin/nl/eduid/di/api/EduIdApi.kt
index b10d38b0..493d24fa 100644
--- a/app/src/main/kotlin/nl/eduid/di/api/EduIdApi.kt
+++ b/app/src/main/kotlin/nl/eduid/di/api/EduIdApi.kt
@@ -45,6 +45,9 @@ interface EduIdApi {
     @GET("/mobile/api/sp/institution/names")
     suspend fun getInstitutionName(@Query("schac_home") schac_home: String): Response<InstitutionNameResponse>
 
+    @GET("/mobile/api/sp/confirm-email")
+    suspend fun confirmEmail(@Query("h") hash: String): Response<UserDetails>
+
     @PUT("/mobile/api/sp/email")
     suspend fun requestEmailChange(@Body email: EmailChangeRequest): Response<UserDetails>
 
diff --git a/app/src/main/kotlin/nl/eduid/di/assist/DataAssistant.kt b/app/src/main/kotlin/nl/eduid/di/assist/DataAssistant.kt
index 5257f8cb..68fe0722 100644
--- a/app/src/main/kotlin/nl/eduid/di/assist/DataAssistant.kt
+++ b/app/src/main/kotlin/nl/eduid/di/assist/DataAssistant.kt
@@ -10,7 +10,7 @@ import javax.inject.Inject
 
 class DataAssistant @Inject constructor(
     private val infoRepository: PersonalInfoRepository,
-    private val storageRepository: StorageRepository
+    private val storageRepository: StorageRepository,
 ) {
     suspend fun getErringUserDetails(): UserDetails? = try {
         infoRepository.getErringUserDetails()
@@ -19,6 +19,21 @@ class DataAssistant @Inject constructor(
         throw e
     }
 
+    suspend fun changeEmail(newEmail: String): Int? = try {
+        infoRepository.changeEmail(newEmail)
+    } catch (e: UnauthorizedException) {
+        storageRepository.clearInvalidAuth()
+        throw e
+    }
+
+
+    suspend fun confirmEmail(confirmEmailHash: String): UserDetails? = try {
+        infoRepository.confirmEmailUpdate(confirmEmailHash)
+    } catch (e: UnauthorizedException) {
+        storageRepository.clearInvalidAuth()
+        throw e
+    }
+
     suspend fun removeService(serviceId: String): UserDetails? = try {
         infoRepository.removeService(serviceId)
     } catch (e: UnauthorizedException) {
diff --git a/app/src/main/kotlin/nl/eduid/graphs/MainGraph.kt b/app/src/main/kotlin/nl/eduid/graphs/MainGraph.kt
index b2b41466..f3cb84f1 100644
--- a/app/src/main/kotlin/nl/eduid/graphs/MainGraph.kt
+++ b/app/src/main/kotlin/nl/eduid/graphs/MainGraph.kt
@@ -71,7 +71,7 @@ fun MainGraph(
             onScanForAuthorization = { navController.navigate(Account.ScanQR.routeForAuth) },
             onActivityClicked = { navController.navigate(Graph.DATA_AND_ACTIVITY) },
             onPersonalInfoClicked = { navController.navigate(Graph.PERSONAL_INFO) },
-            onSecurityClicked = { navController.navigate(Graph.SECURITY) },
+            onSecurityClicked = { navController.navigate(Security.Settings.route) },
             onEnrollWithQR = { navController.navigate(Account.ScanQR.routeForEnrol) },
             launchOAuth = { navController.navigate(Graph.OAUTH) },
             goToRegistrationPinSetup = { challenge ->
@@ -84,8 +84,7 @@ fun MainGraph(
                 navController.navigate(
                     PhoneNumberRecovery.ConfirmCode.routeWithPhoneNumber(phoneNumber, true)
                 )
-            }
-        ) {
+            }) {
             navController.navigate(
                 Graph.REQUEST_EDU_ID_ACCOUNT
             )
@@ -415,7 +414,13 @@ fun MainGraph(
         ) { navController.popBackStack() }
     }//endregion
 
-    composable(Graph.SECURITY) {//region Home - Security
+    composable(Security.Settings.route, deepLinks = listOf(navDeepLink {
+        uriPattern = Security.ConfirmEmail.confirmEmail
+        action = Intent.ACTION_VIEW
+    }, navDeepLink {
+        uriPattern = Security.ConfirmEmail.customSchemeConfirmEmail
+        action = Intent.ACTION_VIEW
+    })) {//region Home - Security
         val viewModel = hiltViewModel<SecurityViewModel>(it)
         SecurityScreen(
             viewModel = viewModel,
diff --git a/app/src/main/kotlin/nl/eduid/graphs/Routes.kt b/app/src/main/kotlin/nl/eduid/graphs/Routes.kt
index 91a20265..304da113 100644
--- a/app/src/main/kotlin/nl/eduid/graphs/Routes.kt
+++ b/app/src/main/kotlin/nl/eduid/graphs/Routes.kt
@@ -15,7 +15,6 @@ object Graph {
     const val FIRST_TIME_DIALOG = "first_time_dialog"
     const val PERSONAL_INFO = "personal_info"
     const val DATA_AND_ACTIVITY = "data_and_activity"
-    const val SECURITY = "security"
     const val OAUTH = "oauth_mobile_eduid"
     const val CONFIGURE_PASSWORD = "configure_password_subgraph"
     const val EDIT_EMAIL = "edit_email"
@@ -217,8 +216,7 @@ object ManageAccountRoute {
         defaultValue = ""
     })
 
-    fun routeWithArgs(dateString: String) =
-        "$route/${Uri.encode(dateString)}"
+    fun routeWithArgs(dateString: String) = "$route/${Uri.encode(dateString)}"
 
 
     fun decodeDateFromBundle(bundleArg: String): String {
@@ -240,11 +238,29 @@ object DeleteTwoFaRoute {
         defaultValue = ""
     })
 
-    fun routeWithArgs(idString: String) =
-        "$route/${Uri.encode(idString)}"
+    fun routeWithArgs(idString: String) = "$route/${Uri.encode(idString)}"
 
     fun decodeIdFromEntry(entry: NavBackStackEntry): String {
         val date = entry.arguments?.getString(idArg) ?: ""
         return Uri.decode(date)
     }
+}
+
+sealed class Security(val route: String) {
+    object Settings : Security("security")
+
+    object ConfirmEmail : Security("confirm_email") {
+        const val confirmEmailHash = "h"
+        val routeWithArgs = "$route?$confirmEmailHash={$confirmEmailHash}"
+        val arguments = listOf(navArgument(confirmEmailHash) {
+            type = NavType.StringType
+            nullable = false
+            defaultValue = ""
+        })
+        const val confirmEmail =
+            "https://login.test2.eduid.nl/client/mobile/update-email?$confirmEmailHash={$confirmEmailHash}"
+        const val customSchemeConfirmEmail =
+            "eduid://client/mobile/update-email?$confirmEmailHash={$confirmEmailHash}"
+
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/kotlin/nl/eduid/screens/editemail/EditEmailScreen.kt b/app/src/main/kotlin/nl/eduid/screens/editemail/EditEmailScreen.kt
index c6b1ff7c..b1a363f5 100644
--- a/app/src/main/kotlin/nl/eduid/screens/editemail/EditEmailScreen.kt
+++ b/app/src/main/kotlin/nl/eduid/screens/editemail/EditEmailScreen.kt
@@ -1,71 +1,99 @@
 package nl.eduid.screens.editemail
 
-import androidx.compose.foundation.Image
-import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.imePadding
+import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.layout.widthIn
-import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.foundation.text.KeyboardOptions
-import androidx.compose.foundation.verticalScroll
-import androidx.compose.material3.CenterAlignedTopAppBar
-import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.LinearProgressIndicator
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.OutlinedTextField
-import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
-import androidx.compose.ui.Alignment
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
-import androidx.compose.runtime.livedata.observeAsState
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberUpdatedState
+import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.runtime.setValue
+import androidx.compose.runtime.snapshotFlow
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusRequester
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalLifecycleOwner
 import androidx.compose.ui.platform.LocalSoftwareKeyboardController
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import androidx.constraintlayout.compose.ConstraintLayout
+import androidx.lifecycle.flowWithLifecycle
+import kotlinx.coroutines.android.awaitFrame
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.filter
 import nl.eduid.R
+import nl.eduid.ui.AlertDialogWithSingleButton
+import nl.eduid.ui.EduIdTopAppBar
 import nl.eduid.ui.PrimaryButton
+import nl.eduid.ui.SecondaryButton
 import nl.eduid.ui.theme.ButtonBlue
-import nl.eduid.ui.theme.ButtonBorderGrey
 import nl.eduid.ui.theme.ButtonGreen
-import nl.eduid.ui.theme.ButtonRed
 import nl.eduid.ui.theme.EduidAppAndroidTheme
-import nl.eduid.ui.theme.TextGrey
 
 @Composable
 fun EditEmailScreen(
     viewModel: EditEmailViewModel,
     onSaveNewEmailRequested: (newEmail: String) -> Unit,
     goBack: () -> Unit,
+) = EduIdTopAppBar(
+    onBackClicked = goBack
 ) {
-    val email by viewModel.emailInput.observeAsState("")
-    val emailValid by viewModel.emailValid.observeAsState(false)
-    val uiState by viewModel.uiState.observeAsState(EditEmailViewModel.UiState.Idle)
-    val uiError by viewModel.uiError.observeAsState("")
+    var waitForVmEvent by rememberSaveable { mutableStateOf(false) }
+    val lifecycle = LocalLifecycleOwner.current.lifecycle
+
+    if (waitForVmEvent) {
+        val currentGoToEmailSent by rememberUpdatedState(newValue = onSaveNewEmailRequested)
+        LaunchedEffect(viewModel, lifecycle) {
+            snapshotFlow { viewModel.uiState }.distinctUntilChanged()
+                .filter { it.isCompleted != null }.flowWithLifecycle(lifecycle).collect {
+                    waitForVmEvent = false
+                    currentGoToEmailSent(viewModel.uiState.email)
+                }
+        }
+    }
+    viewModel.uiState.errorData?.let { errorData ->
+        val context = LocalContext.current
+        AlertDialogWithSingleButton(
+            title = errorData.title(context),
+            explanation = errorData.message(context),
+            buttonLabel = stringResource(R.string.button_ok),
+            onDismiss = viewModel::dismissError
+        )
+    }
 
     EditEmailScreenContent(
-        onNewEmailRequestClicked = { viewModel.requestEmailChangeClicked(it, onSaveNewEmailRequested) },
-        email = email,
-        emailValid = emailValid,
-        onEmailTextChange = { viewModel.onEmailChange(it) },
-        uiState = uiState,
-        uiError = uiError,
+        uiState = viewModel.uiState,
+        padding = it,
+        onNewEmailRequestClicked = {
+            waitForVmEvent = true
+            viewModel.requestEmailChangeClicked(it)
+        },
+        onEmailTextChange = viewModel::onEmailChange,
         goBack = goBack,
     )
 }
@@ -73,146 +101,84 @@ fun EditEmailScreen(
 @OptIn(ExperimentalMaterial3Api::class, ExperimentalComposeUiApi::class)
 @Composable
 fun EditEmailScreenContent(
-    onNewEmailRequestClicked: (newEmail: String) -> Unit = {},
-    email: String,
-    emailValid: Boolean,
+    uiState: UiState,
+    padding: PaddingValues = PaddingValues(),
     onEmailTextChange: (String) -> Unit = {},
-    uiState: EditEmailViewModel.UiState,
-    uiError: String,
+    onNewEmailRequestClicked: (newEmail: String) -> Unit = {},
     goBack: () -> Unit,
+) = Column(
+    modifier = Modifier
+        .fillMaxSize()
+        .padding(padding)
+        .padding(horizontal = 24.dp),
+    verticalArrangement = Arrangement.SpaceBetween
 ) {
-    Scaffold(
-        topBar = {
-            CenterAlignedTopAppBar(
-                modifier = Modifier.padding(top = 42.dp, start = 26.dp, end = 26.dp),
-                navigationIcon = {
-                    Image(
-                        painter = painterResource(R.drawable.back_button_icon),
-                        contentDescription = "",
-                        modifier = Modifier
-                            .size(width = 46.dp, height = 46.dp)
-                            .clickable {
-                                goBack.invoke()
-                            },
-                        alignment = Alignment.Center
-                    )
-                },
-                title = {
-                    Image(
-                        painter = painterResource(R.drawable.ic_top_logo),
-                        contentDescription = "",
-                        modifier = Modifier.size(width = 122.dp, height = 46.dp),
-                        alignment = Alignment.Center
-                    )
-                },
+    Column(
+        horizontalAlignment = Alignment.Start,
+        modifier = Modifier
+            .fillMaxWidth()
+    ) {
+        val keyboardController = LocalSoftwareKeyboardController.current
+        val focusRequester = remember { FocusRequester() }
+        Text(
+            style = MaterialTheme.typography.titleLarge.copy(
+                textAlign = TextAlign.Start, color = ButtonGreen
+            ), text = stringResource(R.string.edit_email_title), modifier = Modifier.fillMaxWidth()
+        )
+        Spacer(Modifier.height(12.dp))
+        if (uiState.inProgress) {
+            LinearProgressIndicator(
+                modifier = Modifier.fillMaxWidth()
             )
-        },
-    ) { paddingValues ->
-        ConstraintLayout(
-            modifier = Modifier
-                .fillMaxSize()
-                .padding(paddingValues)
-                .padding(start = 26.dp, end = 26.dp)
-        ) {
-            val (body, bottomColumn, loader) = createRefs()
-            val keyboardController = LocalSoftwareKeyboardController.current
+            Spacer(Modifier.height(12.dp))
+        }
 
-            if (uiState == EditEmailViewModel.UiState.Loading) {
-                Spacer(Modifier.height(24.dp))
-                CircularProgressIndicator(
-                    modifier = Modifier
-                        .height(80.dp)
-                        .width(80.dp)
-                        .constrainAs(loader) {
-                            start.linkTo(parent.start)
-                            end.linkTo(parent.end)
-                            top.linkTo(parent.top, margin = 20.dp)
-                        }
-                )
-            } else {
-                Column(
-                    verticalArrangement = Arrangement.Top,
-                    modifier = Modifier
-                        .constrainAs(body) {
-                            linkTo(parent.top, bottomColumn.top, bias = 0F)
-                        }
-                        .verticalScroll(rememberScrollState())
+        Text(
+            style = MaterialTheme.typography.bodyLarge.copy(textAlign = TextAlign.Start),
+            text = stringResource(R.string.edit_email_subtitle),
+            modifier = Modifier.fillMaxWidth()
+        )
+        Spacer(Modifier.height(12.dp))
+        OutlinedTextField(
+            value = uiState.email,
+            keyboardOptions = KeyboardOptions(imeAction = ImeAction.Done),
+            keyboardActions = KeyboardActions(onDone = { keyboardController?.hide() }),
+            isError = !uiState.isEmailValid,
+            onValueChange = { onEmailTextChange(it) },
+            label = { Text(stringResource(R.string.edit_email_new_email_title)) },
+            placeholder = { Text(stringResource(R.string.request_id_details_screen_email_input_hint)) },
+            modifier = Modifier
+                .fillMaxWidth()
+                .focusRequester(focusRequester)
 
-                ) {
-                    Spacer(Modifier.height(36.dp))
-                    Text(
-                        style = MaterialTheme.typography.titleLarge.copy(
-                            textAlign = TextAlign.Start,
-                            color = ButtonGreen
-                        ),
-                        text = stringResource(R.string.edit_email_title),
-                        modifier = Modifier
-                            .fillMaxWidth()
-                    )
-                    Spacer(Modifier.height(12.dp))
-                    Text(
-                        style = MaterialTheme.typography.bodyLarge.copy(textAlign = TextAlign.Start),
-                        text = stringResource(R.string.edit_email_subtitle),
-                        modifier = Modifier
-                            .fillMaxWidth()
-                    )
-                    Spacer(Modifier.height(36.dp))
-                    OutlinedTextField(
-                        value = email,
-                        keyboardOptions = KeyboardOptions(imeAction = ImeAction.Done),
-                        keyboardActions = KeyboardActions(onDone = { keyboardController?.hide() }),
-                        isError = (email.length > 2 && !emailValid),
-                        onValueChange = { onEmailTextChange(it) },
-                        label = { Text(stringResource(R.string.edit_email_new_email_title)) },
-                        placeholder = { Text(stringResource(R.string.request_id_details_screen_email_input_hint)) },
-                        modifier = Modifier.fillMaxWidth()
-                    )
-                    if (uiError.isNotBlank()) {
-                        Text(
-                            style = MaterialTheme.typography.bodyLarge.copy(textAlign = TextAlign.Start, color = ButtonRed),
-                            text = uiError,
-                            modifier = Modifier
-                                .fillMaxWidth()
-                                .padding(top = 24.dp)
-                        )
-                    }
-                }
-                Column(
-                    verticalArrangement = Arrangement.Bottom,
-                    modifier = Modifier.constrainAs(bottomColumn) {
-                        bottom.linkTo(parent.bottom, margin = 24.dp)
-                    },
-                ) {
-                    Column(
-                        Modifier
-                            .fillMaxWidth()
-                    ) {
-                        Row(
-                            horizontalArrangement = Arrangement.SpaceEvenly,
-                            modifier = Modifier.fillMaxWidth()
-                        ) {
-                            PrimaryButton(
-                                modifier = Modifier.widthIn(min = 140.dp),
-                                text = stringResource(R.string.edit_email_cancel_button),
-                                onClick = goBack,
-                                buttonBackgroundColor = Color.Transparent,
-                                buttonTextColor = TextGrey,
-                                buttonBorderColor = ButtonBorderGrey,
-                            )
-                            PrimaryButton(
-                                modifier = Modifier.widthIn(min = 140.dp),
-                                text = stringResource(R.string.edit_email_confirm_button),
-                                onClick = { onNewEmailRequestClicked(email) },
-                                buttonBackgroundColor = ButtonBlue,
-                                buttonTextColor = Color.White,
-                                enabled = emailValid,
-                            )
-                        }
-                    }
-                }
-            }
+        )
+        LaunchedEffect(focusRequester) {
+            awaitFrame()
+            focusRequester.requestFocus()
         }
     }
+    Row(
+        horizontalArrangement = Arrangement.SpaceEvenly,
+        modifier = Modifier
+            .fillMaxWidth()
+            .imePadding()
+            .navigationBarsPadding()
+            .padding(bottom = 24.dp),
+    ) {
+        SecondaryButton(
+            modifier = Modifier.widthIn(min = 140.dp),
+            text = stringResource(R.string.edit_email_cancel_button),
+            onClick = goBack,
+        )
+        PrimaryButton(
+            modifier = Modifier.widthIn(min = 140.dp),
+            text = stringResource(R.string.edit_email_confirm_button),
+            onClick = { onNewEmailRequestClicked(uiState.email) },
+            buttonBackgroundColor = ButtonBlue,
+            buttonTextColor = Color.White,
+            enabled = uiState.isEmailValid,
+        )
+    }
 }
 
 
@@ -220,11 +186,8 @@ fun EditEmailScreenContent(
 @Composable
 private fun PreviewEditEmailScreenContent() = EduidAppAndroidTheme {
     EditEmailScreenContent(
-        email = "",
-        emailValid = true,
+        uiState = UiState(),
         onEmailTextChange = {},
-        uiState = EditEmailViewModel.UiState.Idle,
         goBack = { },
-        uiError = "ERROR",
     )
 }
\ No newline at end of file
diff --git a/app/src/main/kotlin/nl/eduid/screens/editemail/EditEmailViewModel.kt b/app/src/main/kotlin/nl/eduid/screens/editemail/EditEmailViewModel.kt
index 67d792e5..45fce727 100644
--- a/app/src/main/kotlin/nl/eduid/screens/editemail/EditEmailViewModel.kt
+++ b/app/src/main/kotlin/nl/eduid/screens/editemail/EditEmailViewModel.kt
@@ -1,49 +1,100 @@
 package nl.eduid.screens.editemail
 
 import android.util.Patterns
-import androidx.lifecycle.MutableLiveData
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.setValue
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.launch
+import nl.eduid.ErrorData
+import nl.eduid.R
 import nl.eduid.di.api.EduIdApi
-import nl.eduid.di.model.EmailChangeRequest
+import nl.eduid.di.assist.DataAssistant
+import nl.eduid.di.model.EMAIL_DOMAIN_FORBIDDEN
+import nl.eduid.di.model.FAIL_EMAIL_IN_USE
 import javax.inject.Inject
 
 @HiltViewModel
-class EditEmailViewModel @Inject constructor(private val eduIdApi: EduIdApi) : ViewModel() {
-    val emailInput = MutableLiveData("")
-    val emailValid = MutableLiveData(false)
-    val uiState = MutableLiveData<UiState>(UiState.Idle)
-    val uiError = MutableLiveData("")
+class EditEmailViewModel @Inject constructor(
+    private val eduIdApi: EduIdApi,
+    private val dataAssistant: DataAssistant,
+) : ViewModel() {
+    var uiState by mutableStateOf(UiState())
+        private set
 
     fun onEmailChange(newValue: String) {
-        emailInput.value = newValue
-        emailValid.value = Patterns.EMAIL_ADDRESS.matcher(emailInput.value?.trim() ?: "").matches()
+        uiState = uiState.copy(email = newValue, isEmailValid = true)
     }
 
-    fun requestEmailChangeClicked(newEmail: String, onSuccess: (email: String) -> Unit) {
-        viewModelScope.launch {
-            try {
-                uiState.value = UiState.Loading
-                val enrollResponse = eduIdApi.requestEmailChange(EmailChangeRequest(newEmail))
-                val response = enrollResponse.body()
-                if (enrollResponse.isSuccessful && response != null) {
-                    uiState.value = UiState.Idle
-                    onSuccess.invoke(emailInput.value?.trim() ?: "")
-                } else {
-                    uiState.value = UiState.Idle
-                    uiError.value = "Failed to request email change"
+    fun dismissError() {
+        uiState = uiState.copy(errorData = null)
+    }
+
+    fun requestEmailChangeClicked(newEmail: String) {
+        val isEmailValid = Patterns.EMAIL_ADDRESS.matcher(uiState.email.trim()).matches()
+        if (isEmailValid) {
+            viewModelScope.launch {
+                try {
+                    uiState = uiState.copy(inProgress = true, isCompleted = null)
+                    val response = dataAssistant.changeEmail(newEmail)
+                    if (response in 200..299) {
+                        uiState = uiState.copy(inProgress = false, isCompleted = Unit)
+                    } else {
+                        val newData = when (response) {
+                            FAIL_EMAIL_IN_USE -> {
+                                uiState.copy(
+                                    inProgress = false, errorData = ErrorData(
+                                        titleId = R.string.err_title_email_in_use,
+                                        messageId = R.string.err_msg_email_in_use,
+                                        messageArg = uiState.email
+                                    )
+                                )
+                            }
+
+                            EMAIL_DOMAIN_FORBIDDEN -> {
+                                uiState.copy(
+                                    inProgress = false, errorData = ErrorData(
+                                        titleId = R.string.err_title_email_domain_forbidden,
+                                        messageId = R.string.err_msg_email_domain_forbidden,
+                                        messageArg = uiState.email
+                                    )
+                                )
+                            }
+
+                            else -> {
+                                uiState.copy(
+                                    inProgress = false, errorData = ErrorData(
+                                        titleId = R.string.err_title_generic_fail,
+                                        messageId = R.string.err_msg_generic_unexpected_with_arg,
+                                        messageArg = uiState.email
+                                    )
+                                )
+                            }
+                        }
+                        uiState = newData
+                    }
+                } catch (e: Exception) {
+                    uiState = uiState.copy(
+                        inProgress = false, errorData = ErrorData(
+                            titleId = R.string.err_title_cannot_update_pass,
+                            messageId = R.string.err_msg_generic_unexpected_with_arg,
+                            messageArg = e.message ?: e.javaClass.simpleName,
+                        )
+                    )
                 }
-            } catch (e: Exception) {
-                uiState.value = UiState.Idle
-                uiError.value = "Failed to request email change"
             }
+        } else {
+            uiState = uiState.copy(isEmailValid = false)
         }
     }
+}
 
-    sealed class UiState {
-        object Idle : UiState()
-        object Loading : UiState()
-    }
-}
\ No newline at end of file
+data class UiState(
+    val email: String = "",
+    val isEmailValid: Boolean = true,
+    val inProgress: Boolean = false,
+    val errorData: ErrorData? = null,
+    val isCompleted: Unit? = null,
+)
\ No newline at end of file
diff --git a/app/src/main/kotlin/nl/eduid/screens/personalinfo/PersonalInfoRepository.kt b/app/src/main/kotlin/nl/eduid/screens/personalinfo/PersonalInfoRepository.kt
index 1588bf19..43fd6268 100644
--- a/app/src/main/kotlin/nl/eduid/screens/personalinfo/PersonalInfoRepository.kt
+++ b/app/src/main/kotlin/nl/eduid/screens/personalinfo/PersonalInfoRepository.kt
@@ -8,6 +8,7 @@ import nl.eduid.di.api.EduIdApi
 import nl.eduid.di.model.ConfirmDeactivationCode
 import nl.eduid.di.model.ConfirmPhoneCode
 import nl.eduid.di.model.DeleteServiceRequest
+import nl.eduid.di.model.EmailChangeRequest
 import nl.eduid.di.model.EnrollResponse
 import nl.eduid.di.model.LinkedAccount
 import nl.eduid.di.model.RequestPhoneCode
@@ -82,6 +83,56 @@ class PersonalInfoRepository(private val eduIdApi: EduIdApi) {
         null
     }
 
+    suspend fun changeEmail(email: String): Int? = try {
+        val response = eduIdApi.requestEmailChange(EmailChangeRequest(email))
+        if (response.isSuccessful) {
+            response.code()
+        } else {
+            if (response.code() == java.net.HttpURLConnection.HTTP_UNAUTHORIZED) {
+                Timber.e("Unauthorized removeService call")
+                throw UnauthorizedException("Unauthorized removeService call")
+            } else {
+                Timber.w(
+                    "Failed to change email to $email: [${response.code()}/${response.message()}]${
+                        response.errorBody()?.string()
+                    }"
+                )
+                response.code()
+            }
+        }
+    } catch (e: UnauthorizedException) {
+        //propagate unauthorized exception, capture everything else.
+        throw e
+    } catch (e: Exception) {
+        Timber.e(e, "Failed to change email")
+        null
+    }
+
+    suspend fun confirmEmailUpdate(hash: String): UserDetails? = try {
+        val response = eduIdApi.confirmEmail(hash)
+        if (response.isSuccessful) {
+            response.body()
+        } else {
+            if (response.code() == java.net.HttpURLConnection.HTTP_UNAUTHORIZED) {
+                Timber.e("Unauthorized removeConnection call")
+                throw UnauthorizedException("Unauthorized removeConnection call")
+            } else {
+                Timber.w(
+                    "Failed to confirm email [${response.code()}/${response.message()}]${
+                        response.errorBody()?.string()
+                    }"
+                )
+                null
+            }
+        }
+    } catch (e: UnauthorizedException) {
+        //propagate unauthorized exception, capture everything else.
+        throw e
+    } catch (e: Exception) {
+        Timber.e(e, "Failed to confirm email change")
+        null
+    }
+
     suspend fun removeService(serviceId: String): UserDetails? = try {
         val tokens = getTokensForUser()
         val tokensForService = tokens?.filter { token ->
diff --git a/app/src/main/kotlin/nl/eduid/screens/resetpassword/ResetPasswordScreen.kt b/app/src/main/kotlin/nl/eduid/screens/resetpassword/ResetPasswordScreen.kt
index 738d0983..6067edcc 100644
--- a/app/src/main/kotlin/nl/eduid/screens/resetpassword/ResetPasswordScreen.kt
+++ b/app/src/main/kotlin/nl/eduid/screens/resetpassword/ResetPasswordScreen.kt
@@ -105,7 +105,8 @@ fun ResetPasswordScreenContent(
     modifier = Modifier
         .fillMaxSize()
         .padding(padding)
-        .padding(horizontal = 24.dp),
+        .navigationBarsPadding()
+        .padding(start = 24.dp, end = 24.dp, bottom = 24.dp),
     verticalArrangement = Arrangement.SpaceBetween
 ) {
     Column(
@@ -141,9 +142,7 @@ fun ResetPasswordScreenContent(
     Row(
         horizontalArrangement = Arrangement.SpaceEvenly,
         modifier = Modifier
-            .fillMaxWidth()
-            .navigationBarsPadding()
-            .padding(bottom = 24.dp),
+            .fillMaxWidth(),
     ) {
         PrimaryButton(
             enabled = !inProgress,
diff --git a/app/src/main/kotlin/nl/eduid/screens/security/SecurityViewModel.kt b/app/src/main/kotlin/nl/eduid/screens/security/SecurityViewModel.kt
index bc1337a0..6f851aef 100644
--- a/app/src/main/kotlin/nl/eduid/screens/security/SecurityViewModel.kt
+++ b/app/src/main/kotlin/nl/eduid/screens/security/SecurityViewModel.kt
@@ -3,6 +3,7 @@ package nl.eduid.screens.security
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
+import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
@@ -12,6 +13,8 @@ import nl.eduid.ErrorData
 import nl.eduid.R
 import nl.eduid.di.assist.DataAssistant
 import nl.eduid.di.model.UnauthorizedException
+import nl.eduid.di.model.UserDetails
+import nl.eduid.graphs.Security
 import org.tiqr.data.repository.IdentityRepository
 import javax.inject.Inject
 
@@ -19,46 +22,84 @@ import javax.inject.Inject
 class SecurityViewModel @Inject constructor(
     private val assistant: DataAssistant,
     private val identity: IdentityRepository,
+    savedStateHandle: SavedStateHandle,
 ) : ViewModel() {
     var uiState: SecurityScreenData by mutableStateOf(SecurityScreenData())
         private set
 
     init {
+        val confirmEmailHash =
+            savedStateHandle.get<String>(Security.ConfirmEmail.confirmEmailHash) ?: ""
+
         viewModelScope.launch {
-            uiState = uiState.copy(isLoading = true, errorData = null)
-            try {
-                val userDetails = assistant.getErringUserDetails()
-                uiState = if (userDetails != null) {
-                    val identity = identity.identity(userDetails.id).firstOrNull()
-                    val provider = if (identity != null) {
-                        identity.identityProvider.displayName
-                    } else {
-                        null
-                    }
-                    uiState.copy(
-                        isLoading = false, errorData = null, email = userDetails.email,
-                        twoFAProvider = provider,
-                        hasPassword = userDetails.hasPasswordSet(),
-                    )
-                } else {
-                    uiState.copy(
-                        isLoading = false, errorData = ErrorData(
-                            titleId = R.string.err_title_load_fail,
-                            messageId = R.string.err_msg_data_history_fail
-                        )
-                    )
-                }
+            if (confirmEmailHash.isNotEmpty()) {
+                confirmEmail(confirmEmailHash)
+            } else {
+                loadUserData()
+            }
+        }
+    }
+
+    private suspend fun confirmEmail(hash: String) {
+        uiState = uiState.copy(isLoading = true, errorData = null)
+        try {
+            val userDetails = assistant.confirmEmail(hash)
+            uiState = fillUserData(userDetails, isChangeEmail = true)
+        } catch (e: UnauthorizedException) {
+            uiState = uiState.copy(
+                isLoading = false, errorData = ErrorData(
+                    titleId = R.string.err_title_load_fail,
+                    messageId = R.string.err_msg_unauthorized_request_fail
+                )
+            )
+        }
+    }
 
-            } catch (e: UnauthorizedException) {
-                uiState = uiState.copy(
+    private suspend fun loadUserData() {
+        uiState = uiState.copy(isLoading = true, errorData = null)
+        try {
+            val userDetails = assistant.getErringUserDetails()
+            uiState = fillUserData(userDetails)
+        } catch (e: UnauthorizedException) {
+            uiState = uiState.copy(
+                isLoading = false, errorData = ErrorData(
+                    titleId = R.string.err_title_load_fail,
+                    messageId = R.string.err_msg_unauthorized_request_fail
+                )
+            )
+        }
+    }
+
+    private suspend fun fillUserData(userDetails: UserDetails?, isChangeEmail: Boolean = false) =
+        if (userDetails != null) {
+            val identity = identity.identity(userDetails.id).firstOrNull()
+            val provider = if (identity != null) {
+                identity.identityProvider.displayName
+            } else {
+                null
+            }
+            uiState.copy(
+                isLoading = false, errorData = null, email = userDetails.email,
+                twoFAProvider = provider,
+                hasPassword = userDetails.hasPasswordSet(),
+            )
+        } else {
+            if (isChangeEmail) {
+                uiState.copy(
+                    isLoading = false, errorData = ErrorData(
+                        titleId = R.string.err_title_generic_fail,
+                        messageId = R.string.err_msg_change_email_fail
+                    )
+                )
+            } else {
+                uiState.copy(
                     isLoading = false, errorData = ErrorData(
                         titleId = R.string.err_title_load_fail,
-                        messageId = R.string.err_msg_unauthorized_request_fail
+                        messageId = R.string.err_msg_personal_fail
                     )
                 )
             }
         }
-    }
 
     fun dismissError() {
         uiState = uiState.copy(errorData = null)
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 1349a7a9..501028d4 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -302,6 +302,7 @@
     <string name="err_title_email_domain_forbidden">E-maildomein is verboden</string>
     <string name="err_msg_email_domain_forbidden">Het e-maildomein gebruikt in %s is niet toegestaan.</string>
     <string name="err_msg_create_unknown_fail">Kan geen eduid-account maken voor e-mail %s.</string>
+    <string name="err_msg_change_email_fail">Kan de wijziging naar uw nieuwe e-mailadres niet bevestigen.</string>
     <string name="err_title_invalid_challenge">Inschrijvingsuitdaging is ongeldig</string>
     <string name="err_msg_invalid_challenge">Kan de inschrijvingsuitdaging niet parseren, de uitdaging is ongeldig.</string>
     <string name="err_msg_request_sms_validation_fail">Kan geen sms-code aanvragen, probeer het opnieuw.</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2a77d4c9..c42d11e5 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -306,6 +306,7 @@
     <string name="err_title_email_domain_forbidden">Email domain is forbidden</string>
     <string name="err_msg_email_domain_forbidden">The email domain used in %s is not allowed.</string>
     <string name="err_msg_create_unknown_fail">Could not create eduid account for email %s.</string>
+    <string name="err_msg_change_email_fail">Could not confirm changing to your new email address.</string>
 
     <string name="err_title_invalid_challenge">Enrollment challenge is invalid</string>
     <string name="err_msg_invalid_challenge">Cannot parse enrollment challenge, challenge is invalid.</string>