Added proper user parsing.