Changed auth handler bind logic