diff --git a/app/src/main/java/org/apache/fineract/ui/online/groups/creategroup/AddGroupLeaderStepFragment.kt b/app/src/main/java/org/apache/fineract/ui/online/groups/creategroup/AddGroupLeaderStepFragment.kt
index 55c2e4d6..6b351e98 100644
--- a/app/src/main/java/org/apache/fineract/ui/online/groups/creategroup/AddGroupLeaderStepFragment.kt
+++ b/app/src/main/java/org/apache/fineract/ui/online/groups/creategroup/AddGroupLeaderStepFragment.kt
@@ -14,6 +14,7 @@ import com.stepstone.stepper.VerificationError
 import com.wajahatkarim3.easyvalidation.core.view_ktx.validator
 import kotlinx.android.synthetic.main.fragment_step_add_group_leader.*
 import kotlinx.android.synthetic.main.fragment_step_add_group_leader.view.*
+import kotlinx.android.synthetic.main.fragment_step_add_group_member.*
 import kotlinx.android.synthetic.main.fragment_step_add_group_member.view.*
 import kotlinx.android.synthetic.main.fragment_step_add_group_member.view.rv_name
 import org.apache.fineract.R
@@ -147,6 +148,10 @@ class AddGroupLeaderStepFragment : FineractBaseFragment(), Step, NameListAdapter
             Toast.makeText(context, getString(R.string.error_group_atleast_1_member), Toast.LENGTH_SHORT).show()
             return VerificationError("")
         }
+        if (llAddLeader.visibility == View.VISIBLE) {
+            etNewLeader.text.clear()
+            llAddLeader.visibility = View.GONE
+        }
         (activity as CreateGroupActivity).setLeaders(leaders)
         return null
     }
diff --git a/app/src/main/java/org/apache/fineract/ui/online/groups/creategroup/AddGroupMemberStepFragment.kt b/app/src/main/java/org/apache/fineract/ui/online/groups/creategroup/AddGroupMemberStepFragment.kt
index b7fe562e..cc95f881 100644
--- a/app/src/main/java/org/apache/fineract/ui/online/groups/creategroup/AddGroupMemberStepFragment.kt
+++ b/app/src/main/java/org/apache/fineract/ui/online/groups/creategroup/AddGroupMemberStepFragment.kt
@@ -145,6 +145,10 @@ class AddGroupMemberStepFragment : FineractBaseFragment(), Step, NameListAdapter
             Toast.makeText(context, getString(R.string.error_group_atleast_1_member), Toast.LENGTH_SHORT).show()
             return VerificationError("")
         }
+        if (llAddMember.visibility == View.VISIBLE) {
+            etNewMember.text.clear()
+            llAddMember.visibility = View.GONE
+        }
         (activity as CreateGroupActivity).setMembers(members)
         return null
     }