Continuing work on https://github.com/WebSharks/s2member/issues/146