Removed dependence on hard-coded username.