SIO-1186 wrong redirect when using admintime

Change-Id: Ieebf3b85dd35d0c75895b3544e37b4a7b4b208a3
Merge "SIO-1186 wrong redirect when using admintime"