fixing username / user bugs