login partial
Merge branch 'robert'