Move credential form into standard modal template, closes #62