Latest adjustments before trying to implement AdminLogin