diff --git a/controllers/UploadMedia.php b/controllers/UploadMedia.php
index 571047ba..1457131e 100644
--- a/controllers/UploadMedia.php
+++ b/controllers/UploadMedia.php
@@ -33,14 +33,10 @@ class UploadMedia extends HTMLController
 				if (empty($uploaded_file))
 					continue;
 
-				// DIY slug club.
-				$slug = $tag->slug . '/' . strtr($uploaded_file['name'], [' ' => '-', '--' => '-', '&' => 'and', '=>' => '', "'" => "", ":"=> "", '\\' => '-']);
-
 				$asset = Asset::createNew([
 					'filename_to_copy' => $uploaded_file['tmp_name'],
 					'preferred_filename' => $uploaded_file['name'],
 					'preferred_subdir' => $tag->slug,
-					'slug' => $slug,
 				]);
 
 				$new_ids[] = $asset->getId();
diff --git a/models/Asset.php b/models/Asset.php
index bdf6b384..8b31c0f6 100644
--- a/models/Asset.php
+++ b/models/Asset.php
@@ -187,9 +187,10 @@ class Asset
 
 		$new_filename = $preferred_filename;
 		$destination = ASSETSDIR . '/' . $preferred_subdir . '/' . $preferred_filename;
-		while (file_exists($destination))
+		for ($i = 1; file_exists($destination); $i++)
 		{
-			$filename = pathinfo($preferred_filename, PATHINFO_FILENAME) . '_' . mt_rand(10, 99);
+			$suffix = $i;
+			$filename = pathinfo($preferred_filename, PATHINFO_FILENAME) . ' (' . $suffix . ')';
 			$extension = pathinfo($preferred_filename, PATHINFO_EXTENSION);
 			$new_filename = $filename . '.' . $extension;
 			$destination = dirname($destination) . '/' . $new_filename;
@@ -206,11 +207,14 @@ class Asset
 		$mimetype = finfo_file($finfo, $destination);
 		finfo_close($finfo);
 
+		// We're going to need the base name a few times...
+		$basename = pathinfo($new_filename, PATHINFO_FILENAME);
+
 		// Do we have a title yet? Otherwise, use the filename.
-		$title = isset($data['title']) ? $data['title'] : pathinfo($preferred_filename, PATHINFO_FILENAME);
+		$title = $data['title'] ?? $basename;
 
 		// Same with the slug.
-		$slug = isset($data['slug']) ? $data['slug'] : $preferred_subdir . '/' . pathinfo($preferred_filename, PATHINFO_FILENAME);
+		$slug = $data['slug'] ?? sprintf('%s/%s', $preferred_subdir, $basename);
 
 		// Detected an image?
 		if (substr($mimetype, 0, 5) == 'image')