Fixed selecting current user