tweaked current user method