Made account formatting and auto complete compatible.