Fixed Edit_User function to be more flexible