Index: sources/view/settings/VSettings.h
===================================================================
diff -u -r7ec98d237f871e5d1206809d309da6d57a086d28 -rc73feffa73c7fe073a7a7581144f5806dfc91beb
--- sources/view/settings/VSettings.h	(.../VSettings.h)	(revision 7ec98d237f871e5d1206809d309da6d57a086d28)
+++ sources/view/settings/VSettings.h	(.../VSettings.h)	(revision c73feffa73c7fe073a7a7581144f5806dfc91beb)
@@ -63,29 +63,33 @@
     PROPERTY(QStringList    , categorys     , {}        )
     PROPERTY(QVariantMap    , instructions  , {}        )
 
-    PROPERTY(bool           , isPasswordSet , false     )
+    PROPERTY(bool           , isDefaultServicePassword  , false     )
 
     SETTINGS(QString        , servicePass   , ""    , Storage::Settings_Category_SettingsSystem , "Service"     , "Password"                        )
     SETTINGS(quint8         , alarmVolume   , 5     , Storage::Settings_Category_SettingsSystem , "Alarm"       , "Volume"                          )
     SETTINGS(bool           , roWaterMode   , false , Storage::Settings_Category_SettingsSystem , "RoWaterMode" , "RoWaterMode"                     )
     SETTINGS(bool           , noCANBus      , false , Storage::Settings_Category_NoCANBus       , "Navigation"  , "Create Treatment To Patient ID"  )
 
+    TRIGGER (bool           , encryptionPass, false )
+
     VIEW_DEC(VSettings, SettingsData)
 
 private:
     TKeysList updateReplacements ( const QString &vGroup, const QStringList &vKeys                                  );
     void      updateInstructions ( const QString &vGroup, const TKeysList   &vKeysList, const QVariantList &vValues );
     void      updateInstructions ( const QString &vGroup );
 
-    QString encryptString       (const QString &vString  );
     QString defaultPassword     ();
     bool    isPasswordDefault   ();
+    QString hashedPassword      (const QString &vPassword, bool vIsService);
 
 public slots:
-    bool    isPasswordValid (const QString &vPassword);
-    bool    isPasswordMatch (const QString &vPassword);
-    void    updatePassword  (const QString &vPassword);
+    bool    isPasswordValid         (const QString &vPassword);
 
+    bool    isServicePasswordMatch  (const QString &vPassword);
+    void    updateServicePassword   (const QString &vPassword);
+    void    checkServicePasswordSet ();
+
 private slots:
     void onActionReceive (GuiActionType vAction, const QVariantList &vData);