Adding workaround for version issue on update of user and fixing weirdness with database scripts