diff --git a/misp_modules/modules/expansion/macvendors.py b/misp_modules/modules/expansion/macvendors.py
index 55d0ef3..bb98366 100644
--- a/misp_modules/modules/expansion/macvendors.py
+++ b/misp_modules/modules/expansion/macvendors.py
@@ -4,7 +4,7 @@ import json
 misperrors = {'error': 'Error'}
 mispattributes = {'input': ['mac-address'], 'output': ['text']}
 moduleinfo = {'version': '0.1', 'author': 'Aurélien Schwab', 'description': 'Module to access Macvendors API.', 'module-type': ['hover']}
-moduleconfig = ['user-agent']  # TODO take this into account in the code
+moduleconfig = ['user-agent']
 
 macvendors_api_url = 'https://api.macvendors.com/'
 default_user_agent = 'MISP-Module'
@@ -21,7 +21,8 @@ def handler(q=False):
     else:
         misperrors['error'] = "Unsupported attributes type"
         return misperrors
-    r = requests.get(macvendors_api_url + mac, headers={'user-agent': default_user_agent})  # Real request
+    user_agent = request['config']['user-agent'] if request.get('config') and request['config'].get('user-agent') else default_user_agent
+    r = requests.get(macvendors_api_url + mac, headers={'user-agent': user_agent})  # Real request
     if r.status_code == 200:  # OK (record found)
         response = r.text
         if response: