current_user stuff

Signed-off-by: Nader Hendawi <naderhen@gmail.com>