diff --git a/src/frontend/ePowerSwitchFrontend.cpp b/src/frontend/ePowerSwitchFrontend.cpp
index 29b06a9..1e56e18 100644
--- a/src/frontend/ePowerSwitchFrontend.cpp
+++ b/src/frontend/ePowerSwitchFrontend.cpp
@@ -11,15 +11,13 @@ int main(int argc, char *argv[]) {
                               "please use an absolute path.");
     }
 
-    std::string frontendName;
-    std::string equipmentName;
+    std::string frontendName = DEFAULT_FRONTEND_NAME;
+    std::string equipmentName = DEFAULT_EQUIPMENT_NAME;
 
     if (argc == 1) {
-        frontendName = DEFAULT_FRONTEND_NAME;
         TMFE::Instance()->Msg(MINFO, __FUNCTION__,
                               "No frontend name provided; %s will be used",
                               DEFAULT_FRONTEND_NAME);
-        equipmentName = DEFAULT_EQUIPMENT_NAME;
         TMFE::Instance()->Msg(MINFO, __FUNCTION__,
                               "No equipment name provided; %s will be used",
                               DEFAULT_EQUIPMENT_NAME);