autologin parameter
merge conflict resolved