More work on refresh auth