Storage empty when user is not found in database
Little cleanup
Removed storage when identity could not be resolved
Fix CS