DEVIDM-79

Various fixes for Signuptool