Fixes #5784: Able to add API account again