password_protected changes to form instead of overlay
Merge branch 'june_24' into development