added support for non javascript users