diff --git a/src/Alarm.cpp b/src/Alarm.cpp
index 77f12bf44fbf8659240c1517121090101c7f95d3..5ddca92fd80988bd8042aac3d0fe70504779a5d7 100644
--- a/src/Alarm.cpp
+++ b/src/Alarm.cpp
@@ -2704,7 +2704,8 @@ void Alarm::enable(Tango::DevString argin)
 		err << "error pushing alarm change event err=" << e.errors[0].desc;
 		INFO_STREAM << __func__<<": " << err.str() << endl;
 	}
-
+	//update attribute properties
+	events->update_property();
 	/*----- PROTECTED REGION END -----*/	//	Alarm::enable
 }
 //--------------------------------------------------------
@@ -2831,7 +2832,8 @@ void Alarm::disable(Tango::DevString argin)
 		err << "error pushing alarm change event err=" << e.errors[0].desc;
 		INFO_STREAM << __func__<<": " << err.str() << endl;
 	}
-	
+	//update attribute properties
+	events->update_property();
 	/*----- PROTECTED REGION END -----*/	//	Alarm::disable
 }
 //--------------------------------------------------------
diff --git a/src/alarm_table.cpp b/src/alarm_table.cpp
index 9042d87b566511a2cc1f296abd47a7c6b9e637a6..e2948dd14c4fea1531ffbba4f6978a6f2678f70c 100644
--- a/src/alarm_table.cpp
+++ b/src/alarm_table.cpp
@@ -811,7 +811,7 @@ void alarm_table::save_alarm_conf_db(string att_name, string name, string status
 	Tango::DbDatum dbd_enabled(ENABLED_KEY);
 
 	Tango::DbData db_data;
-	dbd_att_name << 11;                               // Ten properties for attribute "att_name"
+	dbd_att_name << 11;                               // Eleven properties for attribute "att_name"
 	dbd_name << name;
 	dbd_formula << formula;
 	dbd_on_delay << on_delay;