New off wifi login settings
Merge branch 'charlie'