Fix error when password was put in an object

If the ng-model of the password was in an object (ng-model="user.password"), the scope[attr.password] didn't work.
And since $watch return the value of the watched object, it's much cleaner to use it.