Bug override to avoid exception on login... not proud of it