Fix password handling in the grant statement