Fix password null compairison and cleaned up code using Eclipse