Fix redirects to use ZfcUser post-redirect
Update FlexiTime