diff --git a/portlets/up-activities-portlet/docroot/WEB-INF/src/de/unipotsdam/elis/activities/ActivitiesAdminPortlet.java b/portlets/up-activities-portlet/docroot/WEB-INF/src/de/unipotsdam/elis/activities/ActivitiesAdminPortlet.java
index a82ede141dc7..760250e5b351 100644
--- a/portlets/up-activities-portlet/docroot/WEB-INF/src/de/unipotsdam/elis/activities/ActivitiesAdminPortlet.java
+++ b/portlets/up-activities-portlet/docroot/WEB-INF/src/de/unipotsdam/elis/activities/ActivitiesAdminPortlet.java
@@ -10,6 +10,7 @@
 import com.liferay.portal.kernel.exception.PortalException;
 import com.liferay.portal.kernel.exception.SystemException;
 import com.liferay.portal.kernel.util.ParamUtil;
+import com.liferay.portal.kernel.util.PropsKeys;
 import com.liferay.portal.kernel.util.StringPool;
 import com.liferay.portal.service.LayoutLocalServiceUtil;
 import com.liferay.portal.util.PortalUtil;
@@ -22,7 +23,9 @@
  */
 public class ActivitiesAdminPortlet extends MVCPortlet {
  
-	private static final String _moodleServiceEndpoint = "http://localhost";
+	private static final String _moodleServiceEndpoint = "http://localhost",
+			_moodleServiceUsername = "test",
+			_moodleServicePassword = "test";
 
 	@Override
 	public void processAction(ActionRequest actionRequest,
@@ -37,6 +40,14 @@ public void processAction(ActionRequest actionRequest,
 			if (!param.equals(StringPool.BLANK))
 				prefs.setValue("moodle.service.endpoint", param);
 		
+			param = ParamUtil.getString(actionRequest, "moodleServiceUsername");
+			if (!param.equals(StringPool.BLANK))
+				prefs.setValue("moodle.service.username", param);
+			
+			param = ParamUtil.getString(actionRequest, "moodleServicePassword");
+			if (!param.equals(StringPool.BLANK))
+				prefs.setValue("moodle.service.password", param);
+			
 			prefs.store();
 		} catch (Exception e) {
 			
@@ -50,6 +61,15 @@ public static final String getMoodleServiceEndpoint () {
 		return (result != null ? result : _moodleServiceEndpoint);
 	}
 	
+	public static final String getMoodleServiceUsername () {
+		String result = determinePortletPreferencesValue("moodle.service.username");
+		return (result != null ? result : _moodleServiceUsername);
+	}
+	
+	public static final String getMoodleServicePassword () {
+		String result = determinePortletPreferencesValue("moodle.service.password");
+		return (result != null ? result : _moodleServicePassword);
+	}
 	
 	private static String determinePortletPreferencesValue(String key) {
 
diff --git a/portlets/up-activities-portlet/docroot/html/activitiesadmin/view.jsp b/portlets/up-activities-portlet/docroot/html/activitiesadmin/view.jsp
index 56f44ec42d30..338dbd2ea0ac 100644
--- a/portlets/up-activities-portlet/docroot/html/activitiesadmin/view.jsp
+++ b/portlets/up-activities-portlet/docroot/html/activitiesadmin/view.jsp
@@ -13,7 +13,9 @@
 
 <aui:form action="<%= configurationURL %>" method="post" name="fm">
 
-	<aui:input name="moodleServiceEndpoint" label="Moodle Service Endpoint" value="<%= ActivitiesAdminPortlet.getMoodleServiceEndpoint() %>"/>  
+	<aui:input name="moodleServiceEndpoint" label="Moodle Service Endpoint" value="<%= ActivitiesAdminPortlet.getMoodleServiceEndpoint() %>"/>
+	<aui:input name="moodleServiceUsername" label="Moodle Service Username" value="<%= ActivitiesAdminPortlet.getMoodleServiceUsername() %>"/>
+	<aui:input name="moodleServicePassword" label="Moodle Service Password" value="<%= ActivitiesAdminPortlet.getMoodleServicePassword() %>" type="password"/>  
 
     <aui:button-row>
         <aui:button type="submit" />