Secure journal creation

https://www.pivotaltracker.com/story/show/83870580
and
https://www.pivotaltracker.com/story/show/83870456