Login support added