remove username, fix selector