modified LOGIN-EXT