:construction: multiple fixes to the connection forms validation