re-add edit user link
Merge branch 'develop'