diff --git a/ring-android/app/src/main/java/cx/ring/tv/account/TVProfileCreationFragment.java b/ring-android/app/src/main/java/cx/ring/tv/account/TVProfileCreationFragment.java
index f6326f0b225694e2c297b49198c1e3163ff52c22..ad01b0e560dee218d20c0b2118bafefa904a54f7 100644
--- a/ring-android/app/src/main/java/cx/ring/tv/account/TVProfileCreationFragment.java
+++ b/ring-android/app/src/main/java/cx/ring/tv/account/TVProfileCreationFragment.java
@@ -209,18 +209,35 @@ public class TVProfileCreationFragment extends RingGuidedStepFragment<ProfileCre
     }
 
     public long onGuidedActionEditedAndProceed(GuidedAction action) {
-        if (action.getId() == USER_NAME) {
+        switch ((int) action.getId()){
+            case USER_NAME:
+                String username = action.getEditTitle().toString();
+                presenter.fullNameUpdated(username);
+                if (username.isEmpty())
+                    action.setTitle(getString(R.string.profile_name_hint));
+                else
+                    action.setTitle(username);
+                break;
+            case CAMERA:
+                presenter.cameraClick();
+                break;
+            case GALLERY:
+                presenter.galleryClick();
+                break;
+        }
+        return super.onGuidedActionEditedAndProceed(action);
+    }
+
+    @Override
+    public void onGuidedActionEditCanceled(GuidedAction action) {
+        if ((int) action.getId() == USER_NAME) {
             String username = action.getEditTitle().toString();
             presenter.fullNameUpdated(username);
             if (TextUtils.isEmpty(username))
                 action.setTitle(getString(R.string.profile_name_hint));
             else
                 action.setTitle(username);
-        } else if (action.getId() == CAMERA) {
-            presenter.cameraClick();
-        } else if (action.getId() == GALLERY) {
-            presenter.galleryClick();
         }
-        return super.onGuidedActionEditedAndProceed(action);
+        super.onGuidedActionEditCanceled(action);
     }
 }
\ No newline at end of file