Fix S-ON User Issue

Thanks @Snuzzo
http://forum.xda-developers.com/showpost.php?p=54700548&postcount=74