Fixing issue #9: adding additional if-statement to check for the state of XDef, not just the presence.

Changing setup-string database to change the default key from "standard" to "default" to match the default server config.