User auth block improved