admin: fix var scoping

Change-Id: I210c475840379a703e5fc710efa751ebb1507790
Merge "admin: fix var scoping" into production