Added Existing account check
Merge conflict resolve for hostname