diff --git a/3rdparty b/3rdparty
index 9d8b5602ec..21b466b72c 160000
--- a/3rdparty
+++ b/3rdparty
@@ -1 +1 @@
-Subproject commit 9d8b5602ecb35697919e2a548e2a704058a6d21a
+Subproject commit 21b466b72cdd4c823c011669593ecef1defb1f3c
diff --git a/core/avatar/controller.php b/core/avatar/controller.php
index 9666fd879f..66ee7edafb 100644
--- a/core/avatar/controller.php
+++ b/core/avatar/controller.php
@@ -109,8 +109,8 @@ class OC_Core_Avatar_Controller {
 			// Clean up
 			\OC_Cache::remove('tmpavatar');
 			\OC_JSON::success();
-                } catch (\Exception $e) {
-                        \OC_JSON::error(array("data" => array("message" => $e->getMessage()) ));
-                }
+		} catch (\Exception $e) {
+			\OC_JSON::error(array("data" => array("message" => $e->getMessage()) ));
+		}
 	}
 }
diff --git a/settings/personal.php b/settings/personal.php
index b0d62645d5..6a6619d5a1 100644
--- a/settings/personal.php
+++ b/settings/personal.php
@@ -87,7 +87,6 @@ $tmpl->assign('passwordChangeSupported', OC_User::canUserChangePassword(OC_User:
 $tmpl->assign('displayNameChangeSupported', OC_User::canUserChangeDisplayName(OC_User::getUser()));
 $tmpl->assign('displayName', OC_User::getDisplayName());
 $tmpl->assign('enableDecryptAll' , $enableDecryptAll);
-$tmpl->assign('avatar', OC_Config::getValue('avatar', 'local'));
 
 $forms=OC_App::getForms('personal');
 $tmpl->assign('forms', array());