minor enhancements on database/user name