Merge "Update Edit User Info descriprion to be accurate also  on user creation dialog" into main