diff --git a/ring-android/app/src/main/java/cx/ring/account/JamiAccountSummaryFragment.java b/ring-android/app/src/main/java/cx/ring/account/JamiAccountSummaryFragment.java
index 9d0b79642e74585c8dd7ab19b336edf919df80aa..755a5d553444f078c2f8d0218332de9bf2d923d3 100644
--- a/ring-android/app/src/main/java/cx/ring/account/JamiAccountSummaryFragment.java
+++ b/ring-android/app/src/main/java/cx/ring/account/JamiAccountSummaryFragment.java
@@ -661,8 +661,11 @@ public class JamiAccountSummaryFragment extends BaseSupportFragment<JamiAccountS
             Context context = requireContext();
             File file = AndroidFileUtils.createImageFile(context);
             Uri uri = FileProvider.getUriForFile(context, ContentUriHandler.AUTHORITY_FILES, file);
-            intent.putExtra(MediaStore.EXTRA_OUTPUT, uri);
-            intent.addFlags(Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
+            intent.putExtra(MediaStore.EXTRA_OUTPUT, uri)
+                    .addFlags(Intent.FLAG_GRANT_WRITE_URI_PERMISSION)
+                    .putExtra("android.intent.extras.CAMERA_FACING", 1)
+                    .putExtra("android.intent.extras.LENS_FACING_FRONT", 1)
+                    .putExtra("android.intent.extra.USE_FRONT_CAMERA", true);
             tmpProfilePhotoUri = uri;
         } catch (Exception e) {
             Log.e(TAG, "Can't create temp file", e);
diff --git a/ring-android/app/src/main/java/cx/ring/account/ProfileCreationFragment.java b/ring-android/app/src/main/java/cx/ring/account/ProfileCreationFragment.java
index 4367071d8cc409509819d26f3f1bb2d88a1415de..5df3cf1c86686a75fc657ecac14f7abcb1553832 100644
--- a/ring-android/app/src/main/java/cx/ring/account/ProfileCreationFragment.java
+++ b/ring-android/app/src/main/java/cx/ring/account/ProfileCreationFragment.java
@@ -186,8 +186,11 @@ public class ProfileCreationFragment extends BaseSupportFragment<ProfileCreation
             Context context = requireContext();
             File file = AndroidFileUtils.createImageFile(context);
             Uri uri = ContentUriHandler.getUriForFile(context, ContentUriHandler.AUTHORITY_FILES, file);
-            intent.putExtra(MediaStore.EXTRA_OUTPUT, uri);
-            intent.addFlags(Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
+            intent.putExtra(MediaStore.EXTRA_OUTPUT, uri)
+                    .addFlags(Intent.FLAG_GRANT_WRITE_URI_PERMISSION)
+                    .putExtra("android.intent.extras.CAMERA_FACING", 1)
+                    .putExtra("android.intent.extras.LENS_FACING_FRONT", 1)
+                    .putExtra("android.intent.extra.USE_FRONT_CAMERA", true);
             tmpProfilePhotoUri = uri;
             startActivityForResult(intent, REQUEST_CODE_PHOTO);
         } catch (IOException e) {
diff --git a/ring-android/app/src/main/java/cx/ring/account/RegisterNameDialog.java b/ring-android/app/src/main/java/cx/ring/account/RegisterNameDialog.java
index 5c46aa59342f596818b5a6fe5b534dfd27036163..33b15d8788cfebef096cc088562878a4111dca76 100644
--- a/ring-android/app/src/main/java/cx/ring/account/RegisterNameDialog.java
+++ b/ring-android/app/src/main/java/cx/ring/account/RegisterNameDialog.java
@@ -62,7 +62,7 @@ public class RegisterNameDialog extends DialogFragment {
         mListener = l;
     }
 
-    private void handleBlockchainResult(final int state, final String name) {
+    private void onLookupResult(final int state, final String name) {
         CharSequence actualName = binding.ringUsername.getText();
         if (actualName == null || actualName.length() == 0) {
             binding.ringUsernameTxtBox.setErrorEnabled(false);
@@ -70,7 +70,7 @@ public class RegisterNameDialog extends DialogFragment {
             return;
         }
 
-        if (actualName.equals(name)) {
+        if (name.contentEquals(actualName)) {
             switch (state) {
                 case 0:
                     // on found
@@ -156,7 +156,7 @@ public class RegisterNameDialog extends DialogFragment {
         mDisposableListener = mAccountService
                 .getRegisteredNames()
                 .observeOn(mUiScheduler)
-                .subscribe(r -> handleBlockchainResult(r.state, r.name));
+                .subscribe(r -> onLookupResult(r.state, r.name));
     }
 
     @Override