Dev 1.1 Second Pull Request

I think this should be named $user_name instead?