Final entry (I think so)
I leave profile icon on bottom menu,now when you click it you go firts to your profile and then you can enter in settings by clicking on settings icon on the top. There you can change password,as you said ,user now goes to "enter email" screen(as you can see in flow). In the second image that you were talking about is not "profile" but "client details page" so there shouldn't be such a thing. I hope you will accept changes because they are all very logical.