Fixed the edit user and others bugs