Issue #217 readds user template