diff --git a/src/App/FreeCADInit.py b/src/App/FreeCADInit.py
index 2285c9da36..a291be8030 100644
--- a/src/App/FreeCADInit.py
+++ b/src/App/FreeCADInit.py
@@ -111,7 +111,8 @@ def InitApplications():
     AddPath = FreeCAD.ConfigGet("AdditionalModulePaths").split(";")
     HomeMod = FreeCAD.getUserAppDataDir()+"Mod"
     HomeMod = os.path.realpath(HomeMod)
-    MacroDir = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Macro").GetString("MacroPath")
+    MacroStd = App.getUserMacroDir(False)
+    MacroDir = App.getUserMacroDir(True)
     MacroMod = os.path.realpath(MacroDir+"/Mod")
     SystemWideMacroDir = FreeCAD.getHomePath()+'Macro'
     SystemWideMacroDir = os.path.realpath(SystemWideMacroDir)
@@ -278,6 +279,7 @@ def InitApplications():
     for i in path:
         Log("   " + i + "\n")
     # add MacroDir to path (RFE #0000504)
+    sys.path.append(MacroStd)
     sys.path.append(MacroDir)
     # add SystemWideMacroDir to path
     sys.path.append(SystemWideMacroDir)