Fix 103 - Refractor the current user management

Check if this condition is really necessary for the moment... check what returns user_id if nothing is found...