Login Screen with json query
merged in changes from 6-28 through 6-30