fixes #3897 Default Host stopped when set another host as Default

Fixed the issue and pushed the code for review, please check it.