Added another fix for database types and password encoding