Work-around for #350

See https://github.com/OpenUserJs/OpenUserJS.org/issues/350#issuecomment-60698337 for extreme debuggin/testing results... awaiting feedback

This is my recommendation short term... long term is another story.
Merge pull request #397 from Martii/Issue-350WORKAROUND

Work-around for #350