OC-5649 backported to 1.1

Addressing Krikor's feedback https://github.com/OpenClinica/Designer/pull/37#issuecomment-48061703
("Please apply those changes to 1.1 branch")