Fix for whitespaces in account info