Working on improving security around authentication