diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index e6f85d20d..9818b1a7f 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -2,7 +2,11 @@
 
 **By using the software and services we provide, you agree to our [Terms of Service](https://photoprism.app/terms), including our [Privacy Policy](https://photoprism.app/privacy) and the following Code of Conduct. It explains the "dos and don’ts" when interacting with other community members.**
 
-*Last Updated: May 10, 2022*
+*Last Updated: June 4, 2022*
+
+## Preamble
+
+The Internet is huge, and you inevitably run into people who don't show respect (even if they're nice when you meet them in person), who occasionally have a bad day, or who have simply had too much coffee. Except in the last case, which can be solved by having a smaller cup, it's best to save everyone's time and politely let them know that this is not the right community for them
 
 ## Rules
 
@@ -10,7 +14,7 @@ Because we want our Code of Conduct to be easy to understand and implement, we h
 
 (1) Don't panic.
 
-(2) Don't be evil.
+(2) Be respectful, be responsible, be kind.
 
 (3) Don’t feed the trolls.
 
@@ -18,13 +22,11 @@ Because we want our Code of Conduct to be easy to understand and implement, we h
 
 The following non-exhaustive list provides specific guidelines and examples:
 
-(a) Be respectful, be responsible, be kind, avoid asking for [deadlines](https://docs.photoprism.app/developer-guide/code-quality/#go-slow-before-you-go-fast).
+(a) Do not feel entitled to free software, support, or advice, especially if you are not a contributor, [sponsor](https://photoprism.app/membership), or paying customer. Don't ask contributors to report to you and [meet deadlines](https://docs.photoprism.app/developer-guide/code-quality/#go-slow-before-you-go-fast) as if they work for you or owe you something.
 
-(b) Do not feel entitled to free software, support, or advice if you are **not** a [contributor](https://docs.photoprism.app/developer-guide/), [sponsor](https://photoprism.app/membership), or paying customer.
+(b) [Read the docs](https://docs.photoprism.app) and [determine the cause of your problem](https://docs.photoprism.app/getting-started/troubleshooting/) before opening invalid bug reports, starting a public "shitstorm" or insulting other community members in our chat rooms. Aside from being annoying for everyone, it also keeps our team from working on features and improvements that users like you are waiting for.
 
-(c) [Read the docs](https://docs.photoprism.app) and [determine the cause of your problem](https://docs.photoprism.app/getting-started/troubleshooting/) before opening invalid bug reports, starting a public "shitstorm" or insulting other community members in our chat rooms. Aside from being annoying for everyone, it also keeps our team from working on features and improvements that users like you are waiting for.
-
-(d) If you are having a bad day and want to offend someone, please go somewhere else.
+(c) If you are having a bad day and want to offend someone, please go somewhere else.
 
 ## Reporting