Prevent unnecessary DB call
Improved noscript message