Add space to comments

Can someone please tell me how to change the default comment style in webstorm?

Atm if I use cmd+/ to comment out a HTML line, I get

     <!--Comment-->

How do I add a space to the start and end of 'Comment' so that it becomes

     <!-- Comment -->

Also in JavaScript code, the default comment style is

//Comment

I would like to change it so it's
// Comment