Fixes https://issues.infn.it/jira/browse/VOMS-458

Plus reformatting.