Final fixes for options with popup and sso
Final fixes for options with popup and sso

cwilgenhoff/lock,rpdiss/lock,rpdiss/lock,adam2314/lock,adam2314/lock,cwilgenhoff/lock,adam2314/lock,cwilgenhoff/lock,rpdiss/lock