First of all this is the technical data written on the heater:
I've been using the following connection for my water heater for 2 years before the switch key got molten as shown in the following two pictures ( The heater was always left in the socket and we used the switch key for turning the heater on/off ):
Now, I called for an electrician and he replaced that connection with a breaker of 30 Ampere. As far as I know, A heater like this won't use more than 7 ampere, so I believe it's better to replace it with 15 ampere or something like this.
My question is:
Am I correct that this breaker isn't functional ?
Can this connection cause any damage if I didn't change it ?
EDIT:
This is the main breaker of the home
EDIT 2: The water heater is connected to that C20 breaker with some 7 bulbs of 16 watt each and some times we connect 2000 watt device, so this whole circuit uses about 16.4 Amp. The main circuit breaker of 20A is perfect in my opinion, but still want a perfect connection for the heater itself. Now: What connection is better ?
The old connection but with replacing that 30A switch-breaker with 10A one ?
The new connection as it was, not grounded because no ground sockets in Egypt.
- Something else is better ?