diff --git a/app/src/main/java/org/thoughtcrime/securesms/profiles/edit/EditProfileActivity.java b/app/src/main/java/org/thoughtcrime/securesms/profiles/edit/EditProfileActivity.java
index 25505a9ae7..8ad9df0e72 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/profiles/edit/EditProfileActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/profiles/edit/EditProfileActivity.java
@@ -19,6 +19,7 @@ public class EditProfileActivity extends BaseActionBarActivity implements EditPr
   public static final String EXCLUDE_SYSTEM    = "exclude_system";
   public static final String DISPLAY_USERNAME  = "display_username";
   public static final String NEXT_BUTTON_TEXT  = "next_button_text";
+  public static final String SHOW_BACK_ARROW   = "show_back_arrow";
 
   private final DynamicTheme dynamicTheme    = new DynamicRegistrationTheme();
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/profiles/edit/EditProfileFragment.java b/app/src/main/java/org/thoughtcrime/securesms/profiles/edit/EditProfileFragment.java
index af595f2d63..1fdde60123 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/profiles/edit/EditProfileFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/profiles/edit/EditProfileFragment.java
@@ -23,6 +23,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
 import androidx.annotation.StringRes;
+import androidx.appcompat.widget.Toolbar;
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.ViewModelProviders;
 import androidx.navigation.NavDirections;
@@ -52,11 +53,13 @@ import static org.thoughtcrime.securesms.profiles.edit.EditProfileActivity.DISPL
 import static org.thoughtcrime.securesms.profiles.edit.EditProfileActivity.EXCLUDE_SYSTEM;
 import static org.thoughtcrime.securesms.profiles.edit.EditProfileActivity.NEXT_BUTTON_TEXT;
 import static org.thoughtcrime.securesms.profiles.edit.EditProfileActivity.NEXT_INTENT;
+import static org.thoughtcrime.securesms.profiles.edit.EditProfileActivity.SHOW_BACK_ARROW;
 
 public class EditProfileFragment extends Fragment {
 
   private static final String TAG = Log.tag(EditProfileFragment.class);
 
+  private Toolbar                toolbar;
   private ImageView              avatar;
   private CircularProgressButton finishButton;
   private EditText               givenName;
@@ -187,6 +190,7 @@ public class EditProfileFragment extends Fragment {
   private void initializeResources(@NonNull View view) {
     Bundle arguments = requireArguments();
 
+    this.toolbar            = view.findViewById(R.id.toolbar);
     this.avatar             = view.findViewById(R.id.avatar);
     this.givenName          = view.findViewById(R.id.given_name);
     this.familyName         = view.findViewById(R.id.family_name);
@@ -231,6 +235,11 @@ public class EditProfileFragment extends Fragment {
       NavDirections action = EditProfileFragmentDirections.actionEditUsername();
       Navigation.findNavController(v).navigate(action);
     });
+
+    if (arguments.getBoolean(SHOW_BACK_ARROW, true)) {
+      this.toolbar.setVisibility(View.VISIBLE);
+      this.toolbar.setNavigationOnClickListener(v -> requireActivity().finish());
+    }
   }
 
   private void initializeProfileName() {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/RegistrationCompleteFragment.java b/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/RegistrationCompleteFragment.java
index 7530933f43..665a99376f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/RegistrationCompleteFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/RegistrationCompleteFragment.java
@@ -31,7 +31,11 @@ public final class RegistrationCompleteFragment extends BaseRegistrationFragment
     FragmentActivity activity = requireActivity();
 
     if (!isReregister()) {
-      activity.startActivity(getRoutedIntent(activity, EditProfileActivity.class, new Intent(activity, MainActivity.class)));
+      Intent setProfileNameIntent = getRoutedIntent(activity, EditProfileActivity.class, new Intent(activity, MainActivity.class));
+
+      setProfileNameIntent.putExtra(EditProfileActivity.SHOW_BACK_ARROW, false);
+
+      activity.startActivity(setProfileNameIntent);
     }
 
     activity.finish();
diff --git a/app/src/main/res/layout/profile_create_fragment.xml b/app/src/main/res/layout/profile_create_fragment.xml
index 9733d022fe..88dc7cf37c 100644
--- a/app/src/main/res/layout/profile_create_fragment.xml
+++ b/app/src/main/res/layout/profile_create_fragment.xml
@@ -22,6 +22,16 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
 
+                <androidx.appcompat.widget.Toolbar
+                    android:id="@+id/toolbar"
+                    android:layout_width="match_parent"
+                    android:layout_height="?attr/actionBarSize"
+                    android:visibility="gone"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:navigationIcon="@drawable/ic_arrow_left_24" />
+
                 <TextView
                     android:id="@+id/title"
                     style="@style/TextAppearance.Signal.Title2"