removed get-username check