Version 5.0.0 beta 2

applications/core/sources/Achievements/Rank.php

@@ -300,11 +300,15 @@ class Rank extends Model
 		}
 
 		/* Generate a custom SVG for this badge if we're not using a custom image */
-		if ( ( !array_key_exists( 'rank_use_image', $values ) and !$this->rank_use_image ) or ( array_key_exists( 'rank_use_image', $values ) and !$values['rank_use_image'] ) )
+		if( !array_key_exists( 'rank_use_image', $values ) or !$values['rank_use_image'] )
 		{
 			CustomBadge::saveRecordBadge( $this, CustomBadge::generateBadgeFromFormValues(  $values, 'rank' ) );
 		}
-		
+		else
+		{
+			CustomBadge::clearCustomBadgeFields( $values, 'rank' );
+		}
+
 		return $values;
 	}