Benny 5631 add bookmark message login

This is the fix for https://treehouse.spideroak.com/pandora/ticket/5631

I was running into problems rebasing off of management_console_2.1.4-rc.5, so I checked out a new branch and cherry-picked the commit then pushed it as the original working branch.