Bug fix: user name used as id