Fix errors after thank you page: BB-1752