diff --git a/core/src/main/java/org/mifos/mobilewallet/core/data/fineract/api/BaseURL.java b/core/src/main/java/org/mifos/mobilewallet/core/data/fineract/api/BaseURL.java
index 1d27f8c75..303b7ff4a 100644
--- a/core/src/main/java/org/mifos/mobilewallet/core/data/fineract/api/BaseURL.java
+++ b/core/src/main/java/org/mifos/mobilewallet/core/data/fineract/api/BaseURL.java
@@ -24,4 +24,4 @@ public String getUrl() {
     public String getSelfServiceUrl() {
         return PROTOCOL_HTTPS + API_ENDPOINT_SELF + API_PATH_SELF;
     }
-}
+}
\ No newline at end of file
diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/home/ui/ProfileFragment.java b/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/home/ui/ProfileFragment.java
index 8b58dd637..3e7f1575f 100644
--- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/home/ui/ProfileFragment.java
+++ b/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/home/ui/ProfileFragment.java
@@ -40,10 +40,10 @@ public class ProfileFragment extends BaseFragment implements BaseHomeContract.Pr
 
     BaseHomeContract.ProfilePresenter mProfilePresenter;
 
-    @BindView(R.id.iv_user_image)
+    @BindView(R.id.iv_user_image_two)
     ImageView ivUserImage;
 
-    @BindView(R.id.tv_user_name)
+    @BindView(R.id.tv_user_name_two)
     TextView tvUserName;
 
     @BindView(R.id.nsv_profile_bottom_sheet_dialog)
@@ -124,7 +124,8 @@ public void setPresenter(BaseHomeContract.ProfilePresenter presenter) {
         this.mProfilePresenter = presenter;
     }
 
-    @OnClick(R.id.iv_user_image)
+//    @OnClick(R.id.iv_user_image_two)
+    @OnClick(R.id.iv_user_image_two)
     public void onUserImageEditClicked() {
         if (getActivity() != null) {
             Intent i = new Intent(getActivity(), EditProfileActivity.class);
diff --git a/mifospay/src/main/res/layout/fragment_profile.xml b/mifospay/src/main/res/layout/fragment_profile.xml
index 3b4dbc686..378124f0e 100644
--- a/mifospay/src/main/res/layout/fragment_profile.xml
+++ b/mifospay/src/main/res/layout/fragment_profile.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <include layout="@layout/profile_username_and_image"
+    <include layout="@layout/profile_username"
         android:layout_marginTop="@dimen/marginTopUserProfile"
         android:layout_height="wrap_content"
         android:layout_width="match_parent" />
diff --git a/mifospay/src/main/res/layout/profile_username.xml b/mifospay/src/main/res/layout/profile_username.xml
new file mode 100644
index 000000000..09085b43f
--- /dev/null
+++ b/mifospay/src/main/res/layout/profile_username.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <de.hdodenhof.circleimageview.CircleImageView
+        android:id="@+id/iv_user_image_two"
+        android:layout_width="@dimen/user_profile_image_size"
+        android:layout_height="@dimen/user_profile_image_size"
+        android:layout_gravity="center_horizontal"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/tv_user_name_two"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/marginItemsInSectionSmall"
+        app:fontFamily="@font/roboto_medium"
+        android:textColor="@color/colorBlack87"
+        android:textSize="@dimen/textH6"
+        app:layout_constraintEnd_toEndOf="@+id/iv_user_image_two"
+        app:layout_constraintStart_toStartOf="@+id/iv_user_image_two"
+        app:layout_constraintTop_toBottomOf="@+id/iv_user_image_two" />
+
+</android.support.constraint.ConstraintLayout>
\ No newline at end of file