minor changes to prevent borking of login services