added capiliazations back for user names