fix last_name and email edit actions
Merge branch 'bugfix_5' into dev