Closes #3184476
Added in host/domain flag with an option to add in custom value. Also fixed a few small coding standards.
merged