Enhancement https://github.com/WebSharks/s2member/issues/139#issuecomment-44180775