Minor changes in order to enable embedded login