Fix starting over to create second CSR for different usage
Use the helper to ensure that the protocol is kept on restart.