[cfid-502] Tidy up approvals

[Fixes #42462635] Approvals UI on login server not working out of the box

Change-Id: I94256443da56651a6f24eaa5d6f61ffe0cb7be24