diff --git a/interface_config.js b/interface_config.js
index e048f46db..451cc6362 100644
--- a/interface_config.js
+++ b/interface_config.js
@@ -27,7 +27,7 @@ var interfaceConfig = {
      * Whether to only show the filmstrip (and hide the toolbar).
      */
     filmStripOnly: false,
-    RANDOM_AVATAR_URL_PREFIX: "http://abotars.hipch.at/meeple/",
-    RANDOM_AVATAR_URL_SUFFIX: ".png",
+    RANDOM_AVATAR_URL_PREFIX: false,
+    RANDOM_AVATAR_URL_SUFFIX: false,
     FILM_STRIP_MAX_HEIGHT: 120
 };
diff --git a/modules/UI/avatar/Avatar.js b/modules/UI/avatar/Avatar.js
index 31b489d43..7fbadd444 100644
--- a/modules/UI/avatar/Avatar.js
+++ b/modules/UI/avatar/Avatar.js
@@ -44,18 +44,26 @@ export default {
         if (!avatarId) {
             console.warn(
                 `No avatar stored yet for ${userId} - using ID as avatar ID`);
+            console.log("USER ID ", userId);
             avatarId = userId;
         }
         avatarId = MD5.hexdigest(avatarId.trim().toLowerCase());
 
-        // Default to using gravatar.
-        let urlPref = 'https://www.gravatar.com/avatar/';
-        let urlSuf = "?d=wavatar&size=100";
 
-        if (random && interfaceConfig.RANDOM_AVATAR_URL_PREFIX) {
+        let urlPref = null;
+        let urlSuf = null;
+        if (!random) {
+            urlPref = 'https://www.gravatar.com/avatar/';
+            urlSuf = "?d=wavatar&size=200";
+        }
+        else if (random && interfaceConfig.RANDOM_AVATAR_URL_PREFIX) {
             urlPref = interfaceConfig.RANDOM_AVATAR_URL_PREFIX;
             urlSuf = interfaceConfig.RANDOM_AVATAR_URL_SUFFIX;
         }
+        else {
+            urlPref = 'https://robohash.org/';
+            urlSuf = ".png?size=200x200";
+        }
 
         return urlPref + avatarId + urlSuf;
     }