improved mark & counter mecanisms, fix & reeanble user login redirect