diff --git a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/EmailLogin.kt b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/EmailLogin.kt
index 6945ed327..09c2ff8d2 100644
--- a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/EmailLogin.kt
+++ b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/EmailLogin.kt
@@ -55,6 +55,13 @@ fun EmailLoginView(viewModel: LoginViewModel) {
           .plus(TextStyle(textDecoration = TextDecoration.Underline)),
         onClick = { viewModel.showSocialLogin() }
       )
+
+      ClickableText(
+        text = AnnotatedString("Don't have an account?"),
+        style = MaterialTheme.typography.titleMedium
+          .plus(TextStyle(textDecoration = TextDecoration.Underline)),
+        onClick = { viewModel.showEmailSignUp() }
+      )
     }
     Spacer(modifier = Modifier.weight(1.0F))
   }
diff --git a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/EmailSignUpView.kt b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/EmailSignUpView.kt
new file mode 100644
index 000000000..30184e10f
--- /dev/null
+++ b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/EmailSignUpView.kt
@@ -0,0 +1,129 @@
+package app.omnivore.omnivore.ui.auth
+
+import android.annotation.SuppressLint
+import android.widget.Toast
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.text.ClickableText
+import androidx.compose.foundation.text.KeyboardActions
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.material3.*
+import androidx.compose.runtime.*
+import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalFocusManager
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.input.ImeAction
+import androidx.compose.ui.text.input.PasswordVisualTransformation
+import androidx.compose.ui.text.style.TextDecoration
+import androidx.compose.ui.unit.dp
+
+@SuppressLint("CoroutineCreationDuringComposition")
+@Composable
+fun EmailSignUpView(viewModel: LoginViewModel) {
+  var email by rememberSaveable { mutableStateOf("") }
+  var password by rememberSaveable { mutableStateOf("") }
+
+  Row(
+    horizontalArrangement = Arrangement.Center
+  ) {
+    Spacer(modifier = Modifier.weight(1.0F))
+    Column(
+      verticalArrangement = Arrangement.Center,
+      horizontalAlignment = Alignment.CenterHorizontally
+    ) {
+      EmailSignUpFields(
+        email,
+        password,
+        onEmailChange = { email = it },
+        onPasswordChange = { password = it },
+        onLoginClick = { viewModel.login(email, password) }
+      )
+
+      // TODO: add a activity indicator (maybe after a delay?)
+      if (viewModel.isLoading) {
+        Text("Loading...")
+      }
+
+      ClickableText(
+        text = AnnotatedString("Return to Social Login"),
+        style = MaterialTheme.typography.titleMedium
+          .plus(TextStyle(textDecoration = TextDecoration.Underline)),
+        onClick = { viewModel.showSocialLogin() }
+      )
+
+      ClickableText(
+        text = AnnotatedString("Already have an account?"),
+        style = MaterialTheme.typography.titleMedium
+          .plus(TextStyle(textDecoration = TextDecoration.Underline)),
+        onClick = { viewModel.showEmailSignIn() }
+      )
+    }
+    Spacer(modifier = Modifier.weight(1.0F))
+  }
+}
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun EmailSignUpFields(
+  email: String,
+  password: String,
+  onEmailChange: (String) -> Unit,
+  onPasswordChange: (String) -> Unit,
+  onLoginClick: () -> Unit
+) {
+  val context = LocalContext.current
+  val focusManager = LocalFocusManager.current
+
+  Column(
+    modifier = Modifier
+      .fillMaxWidth()
+      .height(300.dp),
+    verticalArrangement = Arrangement.spacedBy(25.dp),
+    horizontalAlignment = Alignment.CenterHorizontally
+  ) {
+    OutlinedTextField(
+      value = email,
+      placeholder = { Text(text = "user@email.com") },
+      label = { Text(text = "Email") },
+      onValueChange = onEmailChange,
+      keyboardOptions = KeyboardOptions(imeAction = ImeAction.Done),
+      keyboardActions = KeyboardActions(onDone = { focusManager.clearFocus() })
+    )
+
+    OutlinedTextField(
+      value = password,
+      placeholder = { Text(text = "Password") },
+      label = { Text(text = "Password") },
+      onValueChange = onPasswordChange,
+      visualTransformation = PasswordVisualTransformation(),
+      keyboardOptions = KeyboardOptions(imeAction = ImeAction.Done),
+      keyboardActions = KeyboardActions(onDone = { focusManager.clearFocus() })
+    )
+
+    Button(onClick = {
+      if (email.isNotBlank() && password.isNotBlank()) {
+        onLoginClick()
+        focusManager.clearFocus()
+      } else {
+        Toast.makeText(
+          context,
+          "Please enter an email address and password.",
+          Toast.LENGTH_SHORT
+        ).show()
+      }
+    }, colors = ButtonDefaults.buttonColors(
+      contentColor = Color(0xFF3D3D3D),
+      containerColor = Color(0xffffd234)
+    )
+    ) {
+      Text(
+        text = "Login",
+        modifier = Modifier.padding(horizontal = 100.dp)
+      )
+    }
+  }
+}
diff --git a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/LoginViewModel.kt b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/LoginViewModel.kt
index f7b5ab8d2..187b8d280 100644
--- a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/LoginViewModel.kt
+++ b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/LoginViewModel.kt
@@ -24,6 +24,7 @@ import javax.inject.Inject
 enum class RegistrationState {
   SocialLogin,
   EmailSignIn,
+  EmailSignUp,
   PendingUser
 }
 
@@ -64,6 +65,10 @@ class LoginViewModel @Inject constructor(
     registrationStateLiveData.value = RegistrationState.EmailSignIn
   }
 
+  fun showEmailSignUp() {
+    registrationStateLiveData.value = RegistrationState.EmailSignUp
+  }
+
   fun cancelNewUserSignUp() {
     viewModelScope.launch {
       datastoreRepo.clearValue(DatastoreKeys.omnivorePendingUserToken)
diff --git a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/WelcomeScreen.kt b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/WelcomeScreen.kt
index 2996c81c4..7f497d556 100644
--- a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/WelcomeScreen.kt
+++ b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/WelcomeScreen.kt
@@ -63,6 +63,9 @@ fun WelcomeScreenContent(viewModel: LoginViewModel) {
       RegistrationState.EmailSignIn -> {
         EmailLoginView(viewModel = viewModel)
       }
+      RegistrationState.EmailSignUp -> {
+        EmailSignUpView(viewModel = viewModel)
+      }
       RegistrationState.SocialLogin -> {
         Text(
           text = stringResource(id = R.string.welcome_title),