Fix 103 - Refractor the current user management