[#62] account authentication refoactored again