Minor user handling fix and removed trailing whitespaces