updated user edit page and list page.
fix variable name collision on $current_user