hopefully last of login tweaks !!