More fixes to the $current_user code.
user login changes from Abe