diff --git a/ufw b/ufw
index f2ae4bd..37aec28 100755
--- a/ufw
+++ b/ufw
@@ -110,21 +110,17 @@ upload() {
 
 	get_file_hash "$file"
 
-	file_url=$( curl -fsL "${cfg_service_url}/api?mode=file&file=${file_hash}&direct=1&short=${flag_shortlink}" )
-	if ! (( $? )); then
-		printf '%s\n' "$file_url"
-	else
-		curl -sL \
-			-F file="@$file" \
-			-F upload_mode='api' \
-			-F flag_private="$flag_private" \
-			-F short="$flag_shortlink" \
-			-F secret="$secret" \
-			-F submit="" \
-			"${misc_curl_args[@]}" \
-			-A 'zerofiles.org upload script' \
-			"$cfg_service_url/upload"
-	fi
+	curl -sL \
+		-F file="@$file" \
+		-F upload_mode='api' \
+		-F flag_private="$flag_private" \
+		-F short="$flag_shortlink" \
+		-F secret="$secret" \
+		-F submit="" \
+		"${misc_curl_args[@]}" \
+		-A 'zerofiles.org upload script' \
+		"$cfg_service_url/upload"
+fi
 
 	if (( $? )); then
 		err 'Something has gone wrong with the upload.'
@@ -278,8 +274,13 @@ main() {
 				shift
 			;;
 
+			-A|--album-name)
+				misc_curl_args+=( -F "album_name=$2" )
+				shift
+			;;
+
 			-d|--description)
-				misc_curl_args+=( -F "description=$description" )
+				misc_curl_args+=( -F "description=$2" )
 				shift
 			;;